Enable QUIC for proxies based on Finch config and command line switch.

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 24 matching lines @@
 #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/pref_proxy_config_tracker.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.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/policy/core/common/policy_service.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/base/net_util.h"
 #include "net/cert/cert_policy_enforcer.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_proc.h"
 #include "net/cert/ct_known_logs.h"
@@ skipping 977 matching lines @@
   globals.trusted_spdy_proxy.CopyToIfSet(&params->trusted_spdy_proxy);
   globals.force_spdy_over_ssl.CopyToIfSet(&params->force_spdy_over_ssl);
   globals.force_spdy_always.CopyToIfSet(&params->force_spdy_always);
   params->forced_spdy_exclusions = globals.forced_spdy_exclusions;
   globals.use_alternate_protocols.CopyToIfSet(
       &params->use_alternate_protocols);
   globals.alternate_protocol_probability_threshold.CopyToIfSet(
       &params->alternate_protocol_probability_threshold);
 
   globals.enable_quic.CopyToIfSet(&params->enable_quic);
+  globals.enable_quic_for_proxies.CopyToIfSet(&params->enable_quic_for_proxies);
   globals.quic_always_require_handshake_confirmation.CopyToIfSet(
       &params->quic_always_require_handshake_confirmation);
   globals.quic_disable_connection_pooling.CopyToIfSet(
       &params->quic_disable_connection_pooling);
   globals.quic_load_server_info_timeout_ms.CopyToIfSet(
       &params->quic_load_server_info_timeout_ms);
   globals.quic_load_server_info_timeout_srtt_multiplier.CopyToIfSet(
       &params->quic_load_server_info_timeout_srtt_multiplier);
   globals.quic_enable_truncated_connection_ids.CopyToIfSet(
       &params->quic_enable_truncated_connection_ids);
@@ skipping 109 matching lines @@
 }
 
 // static
 void IOThread::ConfigureQuicGlobals(
     const base::CommandLine& command_line,
     base::StringPiece quic_trial_group,
     const VariationParameters& quic_trial_params,
     IOThread::Globals* globals) {
   bool enable_quic = ShouldEnableQuic(command_line, quic_trial_group);
   globals->enable_quic.set(enable_quic);
+  bool enable_quic_for_proxies = ShouldEnableQuicForProxies(command_line,
+                                                            quic_trial_group);
+  globals->enable_quic_for_proxies.set(enable_quic_for_proxies);
+
+  bool enable_quic_for_data_reduction_proxy =
+      ShouldEnableQuicForDataReductionProxy(command_line, quic_trial_group);
+  globals->enable_quic_for_data_reduction_proxy.set(
+      enable_quic_for_data_reduction_proxy);
+
   if (enable_quic) {
     globals->quic_always_require_handshake_confirmation.set(
         ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params));
     globals->quic_disable_connection_pooling.set(
         ShouldQuicDisableConnectionPooling(quic_trial_params));
     int load_server_info_timeout_ms =
         GetQuicLoadServerInfoTimeout(quic_trial_params);
     if (load_server_info_timeout_ms != 0) {
       globals->quic_load_server_info_timeout_ms.set(
           load_server_info_timeout_ms);
@@ skipping 61 matching lines @@
   if (command_line.HasSwitch(switches::kDisableQuic))
     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::ShouldEnableQuicForProxies(const base::CommandLine& command_line,
+                                          base::StringPiece quic_trial_group) {
+  if (command_line.HasSwitch(switches::kDisableQuic))
+    return false;
+
+  return ShouldEnableQuic(command_line, quic_trial_group) ||
+      data_reduction_proxy::DataReductionProxyParams::
+          IsIncludedInQuicFieldTrial();
+}
+
+// static
+bool IOThread::ShouldEnableQuicForDataReductionProxy(
+    const base::CommandLine& command_line,
+    base::StringPiece quic_trial_group) {
+  return ShouldEnableQuicForProxies(command_line, quic_trial_group) &&
+      data_reduction_proxy::DataReductionProxyParams::
+            IsIncludedInQuicFieldTrial();
+}

[Ryan Hamilton, 2015/02/14 00:09:23]

I stared at these two methods for about 10 minutes trying to figure out the
relationship between them. (I was feeling very dense). I think you can rewrite
them to be a bit more clear and to reduce duplication (of the DRPP:IIIQFT call)
as follows:

bool IOThread::ShouldEnableQuicForDataReductionProxy(
    const base::CommandLine& command_line,
    base::StringPiece quic_trial_group) {
  if (command_line.HasSwitch(switches::kDisableQuic))
    return false;

  return data_reduction_proxy::DataReductionProxyParams::
      IsIncludedInQuicFieldTrial();
}

bool IOThread::ShouldEnableQuicForProxies(const base::CommandLine& command_line,
                                          base::StringPiece quic_trial_group) {
  return ShouldEnableQuic(command_line, quic_trial_group) ||
      ShouldEnableQuicForDataReductionProxy(command_line, quic_trial_group);
}

[tbansal1, 2015/02/14 01:06:11]

Done.

+
 bool IOThread::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 152 matching lines @@
   net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
   for (size_t i = 0; i < supported_versions.size(); ++i) {
     net::QuicVersion version = supported_versions[i];
     if (net::QuicVersionToString(version) == quic_version) {
       return version;
     }
   }
 
   return net::QUIC_VERSION_UNSUPPORTED;
 }