Default to disabling consistent port suggestion in QUIC

chrome/browser/io_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 1093 matching lines @@
 }
 
 bool IOThread::ShouldEnableQuicPortSelection(
       const CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kDisableQuicPortSelection))
     return false;
 
   if (command_line.HasSwitch(switches::kEnableQuicPortSelection))
     return true;
 
-#if defined(OS_WIN)
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  // Avoid picking ports (which might induce a security dialog) when we have a
-  // beta or stable release.  Allow in all other cases, including when we do a
-  // developer build (CHANNEL_UNKNOWN).
-  if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
-      channel == chrome::VersionInfo::CHANNEL_BETA) {
-    // TODO(grt) bug=329255: Detect presence of rule on Windows that allows us
-    // to do port selection without inducing a dialog.
-    // When we have an API to see if the administrative security manager will
-    // allow port selection without a security dialog, we may return true if
-    // we're sure there will be no security dialog.
-    return false;
-  }
-  return true;
-#else
-  return true;
-#endif
+  return false;  // Default to disabling port selection on all channels.
 }
 
 bool IOThread::ShouldEnableQuicPacing(const CommandLine& command_line,
                                       base::StringPiece quic_trial_group) {
   if (command_line.HasSwitch(switches::kEnableQuicPacing))
     return true;
 
   if (command_line.HasSwitch(switches::kDisableQuicPacing))
     return false;
 
@@ skipping 67 matching lines @@
   std::string version_flag =
       command_line.GetSwitchValueASCII(switches::kQuicVersion);
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == version_flag) {
       return version;
     }
   }
   return net::QUIC_VERSION_UNSUPPORTED;
 }