commit 1f59bcb2ae6b867fb2f52ff4654b137f98b30536
author kjellander@webrtc.org <kjellander@webrtc.org> Tue Sep 16 08:58:22 2014 +0000
committer kjellander@webrtc.org <kjellander@webrtc.org> Tue Sep 16 08:58:22 2014 +0000
tree c7a57cf6ec9e17117bfeaede910b72afa3895288
parent 109ba4e39c525c7d0f0fa4e59e9a22bbf034ef08

Revert 7184 "Enable ipv6 by default for webrtc under a Finch exp..."

Breaks Chrome build and prevents rolling WebRTC into Chrome DEPS.

> Enable ipv6 by default for webrtc under a Finch experiment.
> 
> BUG=413437 (chromium)
> https://code.google.com/p/chromium/issues/detail?id=413437
> 
> Review URL: https://webrtc-codereview.appspot.com/23529005

TBR=guoweis@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/30399004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7190 4adac7df-926f-26a2-2b94-8c16560cd09d

app/webrtc/peerconnection.cc

diff --git a/app/webrtc/peerconnection.cc b/app/webrtc/peerconnection.cc
index d133889..3698381 100644
--- a/app/webrtc/peerconnection.cc
+++ b/app/webrtc/peerconnection.cc
@@ -39,9 +39,6 @@
 #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 {
 
@@ -356,19 +353,12 @@
                             cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
                             cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET;
   bool value;
-  // If IPv6 flag was specified, we'll not override it by experiment.
   if (FindConstraint(
-          constraints, MediaConstraintsInterface::kEnableIPv6, &value, NULL)) {
-    if (value) {
-      portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6;
-    }
-  }
-#ifdef WEBRTC_CHROMIUM_BUILD
-  else if (webrtc::field_trial::FindFullName("WebRTC-IPv6Default") ==
-           "Enabled") {
+        constraints,
+        MediaConstraintsInterface::kEnableIPv6,
+        &value, NULL) && value) {
     portallocator_flags |= cricket::PORTALLOCATOR_ENABLE_IPV6;
   }
-#endif  // WEBRTC_CHROMIUM_BUILD
 
   port_allocator_->set_flags(portallocator_flags);
   // No step delay is used while allocating ports.