From 2c1bcea1bc5001bc2dc7d4eead87749f18eaadad Mon Sep 17 00:00:00 2001 From: "guoweis@webrtc.org" Date: Tue, 23 Sep 2014 16:23:02 +0000 Subject: [PATCH] Enable ipv6 by default for webrtc under a Finch experiment. Reapply 23529005 after fixing the build break issue (Chromium:582133002) Committed: https://code.google.com/p/webrtc/source/detail?r=7253 Review URL: https://webrtc-codereview.appspot.com/23529005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7278 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/peerconnection.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index d1338897da..d939f98b3e 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -39,9 +39,7 @@ #include "talk/session/media/channelmanager.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" -#ifdef WEBRTC_CHROMIUM_BUILD #include "webrtc/system_wrappers/interface/field_trial.h" -#endif namespace { @@ -362,13 +360,10 @@ bool PeerConnection::DoInitialize( if (value) { portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6; } - } -#ifdef WEBRTC_CHROMIUM_BUILD - else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") == - "Enabled") { + } else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") == + "Enabled") { portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6; } -#endif // WEBRTC_CHROMIUM_BUILD port_allocator_->set_flags(portallocator_flags); // No step delay is used while allocating ports.