Bug 1196974: remove mozDontOfferDataChannel from code and test. r=bwc

MozReview-Commit-ID: 1CW3TaSMVZw

--HG--
extra : rebase_source : dc0e069e07d28dc53c4ba57954491bb5a663b518

media/webrtc/signaling/gtest/jsep_session_unittest.cpp

@@ -2953,7 +2953,6 @@ TEST_F(JsepSessionTest, OfferAnswerRecvOnlyLines)
   JsepOfferOptions options;
   options.mOfferToReceiveAudio = Some(static_cast<size_t>(1U));
   options.mOfferToReceiveVideo = Some(static_cast<size_t>(2U));
-  options.mDontOfferDataChannel = Some(true);
   std::string offer = CreateOffer(Some(options));
 
   UniquePtr<Sdp> parsedOffer(Parse(offer));
@@ -3030,7 +3029,6 @@ TEST_F(JsepSessionTest, OfferAnswerSendOnlyLines)
   JsepOfferOptions options;
   options.mOfferToReceiveAudio = Some(static_cast<size_t>(0U));
   options.mOfferToReceiveVideo = Some(static_cast<size_t>(1U));
-  options.mDontOfferDataChannel = Some(true);
   std::string offer = CreateOffer(Some(options));
 
   UniquePtr<Sdp> outputSdp(Parse(offer));

media/webrtc/signaling/src/jsep/JsepSession.h

@@ -49,7 +49,6 @@ struct JsepOAOptions {};
 struct JsepOfferOptions : public JsepOAOptions {
   Maybe<size_t> mOfferToReceiveAudio;
   Maybe<size_t> mOfferToReceiveVideo;
-  Maybe<bool> mDontOfferDataChannel;
   Maybe<bool> mIceRestart; // currently ignored by JsepSession
 };
 struct JsepAnswerOptions : public JsepOAOptions {};

media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp

@@ -428,13 +428,10 @@ JsepSessionImpl::SetupOfferMSections(const JsepOfferOptions& options, Sdp* sdp)
 
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!(options.mDontOfferDataChannel.isSome() &&
-        *options.mDontOfferDataChannel)) {
-    rv = SetupOfferMSectionsByType(
-        SdpMediaSection::kApplication, Maybe<size_t>(), sdp);
+  rv = SetupOfferMSectionsByType(
+      SdpMediaSection::kApplication, Maybe<size_t>(), sdp);
 
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
+  NS_ENSURE_SUCCESS(rv, rv);
 
   if (!sdp->GetMediaSectionCount()) {
     JSEP_SET_ERROR("Cannot create an offer with no local tracks, "

media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp

@@ -1461,10 +1461,6 @@ PeerConnectionImpl::CreateOffer(const RTCOfferOptions& aOptions)
 
   options.mIceRestart = mozilla::Some(aOptions.mIceRestart);
 
-  if (aOptions.mMozDontOfferDataChannel.WasPassed()) {
-    options.mDontOfferDataChannel =
-      mozilla::Some(aOptions.mMozDontOfferDataChannel.Value());
-  }
   return CreateOffer(options);
 }