Enable QUIC for proxies only when QUIC is enabled

chrome/browser/io_thread_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/test/mock_entropy_provider.h"
 #include "build/build_config.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "components/policy/core/common/mock_policy_service.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/cert_net/nss_ocsp.h"
@@ skipping 61 matching lines @@
   EXPECT_EQ(0u, params_.testing_fixed_http_port);
   EXPECT_EQ(0u, params_.testing_fixed_https_port);
   EXPECT_FALSE(params_.enable_spdy31);
   EXPECT_TRUE(params_.enable_http2);
   EXPECT_FALSE(params_.enable_tcp_fast_open_for_ssl);
   EXPECT_TRUE(params_.parse_alternative_services);
   EXPECT_FALSE(params_.enable_alternative_service_with_different_host);
   EXPECT_FALSE(params_.enable_npn);
   EXPECT_TRUE(params_.enable_priority_dependencies);
   EXPECT_FALSE(params_.enable_quic);
-  EXPECT_FALSE(params_.enable_quic_for_proxies);
-  EXPECT_FALSE(IOThread::ShouldEnableQuicForDataReductionProxy());
 }
 
 TEST_F(NetworkSessionConfiguratorTest, IgnoreCertificateErrors) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       "ignore-certificate-errors");
 
   ParseFieldTrialsAndCommandLine();
 
   EXPECT_TRUE(params_.ignore_certificate_errors);
 }
@@ skipping 123 matching lines @@
   EXPECT_FALSE(params_.enable_priority_dependencies);
 }
 
 TEST_F(NetworkSessionConfiguratorTest, EnableQuicFromFieldTrialGroup) {
   base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
 
   ParseFieldTrials();
 
   EXPECT_TRUE(params_.enable_quic);
   EXPECT_FALSE(params_.disable_quic_on_timeout_with_open_streams);
-  EXPECT_TRUE(params_.enable_quic_for_proxies);
   EXPECT_EQ(1350u, params_.quic_max_packet_length);
   EXPECT_EQ(net::QuicTagVector(), params_.quic_connection_options);
   EXPECT_FALSE(params_.quic_always_require_handshake_confirmation);
   EXPECT_FALSE(params_.quic_disable_connection_pooling);
   EXPECT_EQ(0.25f, params_.quic_load_server_info_timeout_srtt_multiplier);
   EXPECT_FALSE(params_.quic_enable_connection_racing);
   EXPECT_FALSE(params_.quic_enable_non_blocking_io);
   EXPECT_FALSE(params_.quic_disable_disk_cache);
   EXPECT_FALSE(params_.quic_prefer_aes);
   EXPECT_TRUE(params_.parse_alternative_services);
   EXPECT_FALSE(params_.enable_alternative_service_with_different_host);
   EXPECT_EQ(0, params_.quic_max_number_of_lossy_connections);
   EXPECT_EQ(1.0f, params_.quic_packet_loss_threshold);
   EXPECT_FALSE(params_.quic_close_sessions_on_ip_change);
   EXPECT_EQ(net::kIdleConnectionTimeoutSeconds,
             params_.quic_idle_connection_timeout_seconds);
   EXPECT_FALSE(params_.quic_disable_preconnect_if_0rtt);
   EXPECT_FALSE(params_.quic_migrate_sessions_on_network_change);
   EXPECT_FALSE(params_.quic_migrate_sessions_early);
-  EXPECT_FALSE(IOThread::ShouldEnableQuicForDataReductionProxy());
   EXPECT_TRUE(params_.quic_host_whitelist.empty());
 
   net::HttpNetworkSession::Params default_params;
   EXPECT_EQ(default_params.quic_supported_versions,
             params_.quic_supported_versions);
 }
 
 TEST_F(NetworkSessionConfiguratorTest,
        DisableQuicWhenConnectionTimesOutWithOpenStreamsFromFieldTrialParams) {
   std::map<std::string, std::string> field_trial_params;
   field_trial_params["disable_quic_on_timeout_with_open_streams"] = "true";
   variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
   base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
 
   ParseFieldTrials();
 
   EXPECT_TRUE(params_.disable_quic_on_timeout_with_open_streams);
 }
 
-TEST_F(NetworkSessionConfiguratorTest, EnableQuicFromQuicProxyFieldTrialGroup) {
-  const struct {
-    std::string field_trial_group_name;
-    bool expect_enable_quic;
-  } tests[] = {
-      {
-          std::string(), false,
-      },
-      {
-          "NotEnabled", false,
-      },
-      {
-          "Control", false,
-      },
-      {
-          "Disabled", false,
-      },
-      {
-          "EnabledControl", true,
-      },
-      {
-          "Enabled", true,
-      },
-  };
-
-  field_trial_list_.reset();
-  for (size_t i = 0; i < arraysize(tests); ++i) {
-    base::FieldTrialList field_trial_list(new base::MockEntropyProvider());
-    base::FieldTrialList::CreateFieldTrial(
-        data_reduction_proxy::params::GetQuicFieldTrialName(),
-        tests[i].field_trial_group_name);
-
-    ParseFieldTrials();
-
-    EXPECT_FALSE(params_.enable_quic) << i;
-    EXPECT_EQ(tests[i].expect_enable_quic, params_.enable_quic_for_proxies)
-        << i;
-    EXPECT_EQ(tests[i].expect_enable_quic,
-              IOThread::ShouldEnableQuicForDataReductionProxy())
-        << i;
-  }
-}
-
 TEST_F(NetworkSessionConfiguratorTest, EnableQuicFromCommandLine) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch("enable-quic");
 
   ParseFieldTrialsAndCommandLine();
 
   EXPECT_TRUE(params_.enable_quic);
-  EXPECT_TRUE(params_.enable_quic_for_proxies);
-  EXPECT_FALSE(IOThread::ShouldEnableQuicForDataReductionProxy());
 }
 
 TEST_F(NetworkSessionConfiguratorTest,
        EnableAlternativeServicesFromCommandLineWithQuicDisabled) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       "enable-alternative-services");
 
   ParseFieldTrialsAndCommandLine();
 
   EXPECT_FALSE(params_.enable_quic);
@@ skipping 519 matching lines @@
       &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType,
       base::Unretained(this), "acc1"));
   pref_service()->SetString(prefs::kAuthAndroidNegotiateAccountType, "acc2");
   RunOnIOThreadBlocking(base::Bind(
       &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType,
       base::Unretained(this), "acc2"));
 }
 #endif
 
 }  // namespace test