Default to disabling consistent port suggestion in QUIC

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index adabf01dec251aab966cffdf29e3a268cb11c825..00ff6db20f689a17f64c71d0a34b222c5e2dbc4a 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -1111,24 +1111,7 @@ bool IOThread::ShouldEnableQuicPortSelection(
   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,