Enable QUIC for proxies only when QUIC is enabled

ios/chrome/browser/ios_chrome_io_thread.mm

 // Copyright 2015 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 "ios/chrome/browser/ios_chrome_io_thread.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 627 matching lines @@
       &params->parse_alternative_services);
   globals.enable_alternative_service_with_different_host.CopyToIfSet(
       &params->enable_alternative_service_with_different_host);
 
   globals.enable_npn.CopyToIfSet(&params->enable_npn);
 
   globals.enable_priority_dependencies.CopyToIfSet(
       &params->enable_priority_dependencies);
 
   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_srtt_multiplier.CopyToIfSet(
       &params->quic_load_server_info_timeout_srtt_multiplier);
   globals.quic_enable_connection_racing.CopyToIfSet(
       &params->quic_enable_connection_racing);
   globals.quic_enable_non_blocking_io.CopyToIfSet(
       &params->quic_enable_non_blocking_io);
@@ skipping 86 matching lines @@
 
   ConfigureQuicGlobals(group, params, globals_);
 }
 
 void IOSChromeIOThread::ConfigureQuicGlobals(
     base::StringPiece quic_trial_group,
     const VariationParameters& quic_trial_params,
     IOSChromeIOThread::Globals* globals) {
   bool enable_quic = ShouldEnableQuic(quic_trial_group);
   globals->enable_quic.set(enable_quic);
-  bool enable_quic_for_proxies = ShouldEnableQuicForProxies(quic_trial_group);
-  globals->enable_quic_for_proxies.set(enable_quic_for_proxies);
 
   if (ShouldQuicEnableAlternativeServicesForDifferentHost(quic_trial_params)) {
     globals->enable_alternative_service_with_different_host.set(true);
     globals->parse_alternative_services.set(true);
   } else {
     globals->enable_alternative_service_with_different_host.set(false);
   }
 
   if (enable_quic) {
     globals->quic_always_require_handshake_confirmation.set(
@@ skipping 52 matching lines @@
     supported_versions.push_back(version);
     globals->quic_supported_versions.set(supported_versions);
   }
 }
 
 bool IOSChromeIOThread::ShouldEnableQuic(base::StringPiece quic_trial_group) {
   return quic_trial_group.starts_with(kQuicFieldTrialEnabledGroupName) ||
          quic_trial_group.starts_with(kQuicFieldTrialHttpsEnabledGroupName);
 }
 
-bool IOSChromeIOThread::ShouldEnableQuicForProxies(
-    base::StringPiece quic_trial_group) {
-  return ShouldEnableQuic(quic_trial_group) ||
-         ShouldEnableQuicForDataReductionProxy();
-}
-
-bool IOSChromeIOThread::ShouldEnableQuicForDataReductionProxy() {
-  return data_reduction_proxy::params::IsIncludedInQuicFieldTrial();
-}
-
 net::QuicTagVector IOSChromeIOThread::GetQuicConnectionOptions(
     const VariationParameters& quic_trial_params) {
   VariationParameters::const_iterator it =
       quic_trial_params.find("connection_options");
   if (it == quic_trial_params.end()) {
     return net::QuicTagVector();
   }
 
   return net::QuicUtils::ParseQuicConnectionOptions(it->second);
 }
@@ skipping 174 matching lines @@
 
   globals->system_http_network_session.reset(
       new net::HttpNetworkSession(system_params));
   globals->system_http_transaction_factory.reset(
       new net::HttpNetworkLayer(globals->system_http_network_session.get()));
   context->set_http_transaction_factory(
       globals->system_http_transaction_factory.get());
 
   return context;
 }