Enable QUIC for proxies only when QUIC is enabled

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 <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 26 matching lines @@
 #include "chrome/browser/net/async_dns_field_trial.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/dns_probe_service.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_content_client.h"
 #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"
 #include "components/metrics/metrics_service.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
 #include "components/variations/variations_associated_data.h"
@@ skipping 1098 matching lines @@
 
 const net::HttpNetworkSession::Params& IOThread::NetworkSessionParams() const {
   return params_;
 }
 
 base::TimeTicks IOThread::creation_time() const {
   return creation_time_;
 }
 
 // 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();
 }
 
 void IOThread::ChangedToOnTheRecordOnIOThread() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Clear the host cache to avoid showing entries from the OTR session
   // in about:net-internals.
   ClearHostCache();
@@ skipping 43 matching lines @@
 void IOThread::NetworkSessionConfigurator::ConfigureQuicParams(
     const base::CommandLine& command_line,
     base::StringPiece quic_trial_group,
     const VariationParameters& quic_trial_params,
     bool is_quic_allowed_by_policy,
     net::HttpNetworkSession::Params* params) {
   params->enable_quic = ShouldEnableQuic(command_line, quic_trial_group,
                                          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)) {
     params->enable_alternative_service_with_different_host = true;
     params->parse_alternative_services = true;
   } else {
     params->enable_alternative_service_with_different_host = false;
   }
 
   if (params->enable_quic) {
@@ skipping 102 matching lines @@
     return false;
 
   if (command_line.HasSwitch(switches::kEnableQuic))
     return true;
 
   return quic_trial_group.starts_with(kQuicFieldTrialEnabledGroupName) ||
          quic_trial_group.starts_with(kQuicFieldTrialHttpsEnabledGroupName);
 }
 
 // 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))
     return false;
 
   if (command_line.HasSwitch(switches::kEnableQuicPortSelection))
     return true;
 
   return false;  // Default to disabling port selection on all channels.
 }
@@ skipping 383 matching lines @@
   // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
   // system URLRequestContext too. There's no reason this should be tied to a
   // profile.
   return context;
 }
 
 const metrics::UpdateUsagePrefCallbackType&
 IOThread::GetMetricsDataUseForwarder() {
   return metrics_data_use_forwarder_;
 }