Bug 1264351: removed hand break which disables ICE TCP on e10s draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Wed, 13 Apr 2016 10:16:35 -0700
changeset 350434 1efe6f5eb61be588995ab1185608ed318aa86b67
parent 350335 564b225d553547fe4aa9a1039278f695c9507db9
child 518339 735559f2072ab57106055c5b9422e97c40791d7a
push id15346
push userdrno@ohlmeier.org
push dateWed, 13 Apr 2016 18:48:37 +0000
bugs1264351
milestone48.0a1
Bug 1264351: removed hand break which disables ICE TCP on e10s MozReview-Commit-ID: 8Llssz59QwM
media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
@@ -301,20 +301,16 @@ nsresult PeerConnectionMedia::Init(const
                          handler, getter_AddRefs(mProxyRequest));
   if (NS_FAILED(rv)) {
     CSFLogError(logTag, "%s: Failed to resolve protocol proxy: %d", __FUNCTION__, (int)rv);
     return NS_ERROR_FAILURE;
   }
 
 #if !defined(MOZILLA_EXTERNAL_LINKAGE)
   bool ice_tcp = Preferences::GetBool("media.peerconnection.ice.tcp", false);
-  if (!XRE_IsParentProcess()) {
-    CSFLogError(logTag, "%s: ICE TCP not support on e10s", __FUNCTION__);
-    ice_tcp = false;
-  }
 #else
   bool ice_tcp = false;
 #endif
   bool default_address_only = GetPrefDefaultAddressOnly();
 
   // TODO(ekr@rtfm.com): need some way to set not offerer later
   // Looks like a bug in the NrIceCtx API.
   mIceCtxHdlr = NrIceCtxHandler::Create("PC:" + mParentName,