Enable QUIC for proxies only when QUIC is enabled

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 b78faf78ce0a6fa925a982d0387a95d047da1045..d5d3c11a4efb2b637fe0f1d5b964caaa82ed5264 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -44,7 +44,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/data_usage/core/data_use_aggregator.h"
 #include "components/data_usage/core/data_use_amortizer.h"
 #include "components/data_usage/core/data_use_annotator.h"
@@ -1163,13 +1162,6 @@ base::TimeTicks IOThread::creation_time() const {
 }
 
 // static
-bool IOThread::ShouldEnableQuicForDataReductionProxy() {
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-  return NetworkSessionConfigurator::ShouldEnableQuicForDataReductionProxy(
-      command_line);
-}
-
 net::SSLConfigService* IOThread::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
@@ -1233,8 +1225,6 @@ void IOThread::NetworkSessionConfigurator::ConfigureQuicParams(
                                          is_quic_allowed_by_policy);
   params->disable_quic_on_timeout_with_open_streams =
       ShouldDisableQuicWhenConnectionTimesOutWithOpenStreams(quic_trial_params);
-  params->enable_quic_for_proxies = ShouldEnableQuicForProxies(
-      command_line, quic_trial_group, is_quic_allowed_by_policy);
 
   if (ShouldQuicEnableAlternativeServicesForDifferentHost(command_line,
                                                           quic_trial_params)) {
@@ -1357,26 +1347,6 @@ bool IOThread::NetworkSessionConfigurator::ShouldEnableQuic(
 }
 
 // static
-bool IOThread::NetworkSessionConfigurator::ShouldEnableQuicForProxies(
-    const base::CommandLine& command_line,
-    base::StringPiece quic_trial_group,
-    bool is_quic_allowed_by_policy) {
-  return ShouldEnableQuic(command_line, quic_trial_group,
-                          is_quic_allowed_by_policy) ||
-         ShouldEnableQuicForDataReductionProxy(command_line);
-}
-

[Ryan Hamilton, 2016/05/10 21:31:14]

This means that the only way to enable QUIC for flywheel is to opt into the QUIC
field trial. Is that really what you want? It seems like that will mean that
quic-team will be enabling/disabling QUIC in flywheel?

[tbansal1, 2016/05/10 21:43:46]

Yes, I think that's the right approach in longer term. It avoids any weird bugs
that may pop up when enable_quic != enable_quic_for_proxies. wdyt?

[Ryan Hamilton, 2016/05/10 22:41:24]

Discussed offline. LGTM.

-// static
-bool IOThread::NetworkSessionConfigurator::
-    ShouldEnableQuicForDataReductionProxy(
-        const base::CommandLine& command_line) {
-  if (command_line.HasSwitch(switches::kDisableQuic))
-    return false;
-
-  return data_reduction_proxy::params::IsIncludedInQuicFieldTrial();
-}
-
-// static
 bool IOThread::NetworkSessionConfigurator::ShouldEnableQuicPortSelection(
     const base::CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kDisableQuicPortSelection))