Clean up QUIC field trial parsing code.

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 "base/command_line.h"
 #include "chrome/browser/io_thread.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/quic/quic_protocol.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 126 matching lines @@
   EXPECT_FALSE(params.quic_enable_truncated_connection_ids);
 }
 
 TEST_F(IOThreadTest, EnableQuicFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, EnablePacingFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitch("enable-quic-pacing");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   net::QuicTagVector options;
   options.push_back(net::kPACE);
   EXPECT_EQ(options, params.quic_connection_options);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, EnablePacingFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["enable_pacing"] = "true";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   net::QuicTagVector options;
   options.push_back(net::kPACE);
   EXPECT_EQ(options, params.quic_connection_options);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, PacketLengthFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitchASCII("quic-max-packet-length", "1450");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(1450u, params.quic_max_packet_length);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, PacketLengthFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["max_packet_length"] = "1450";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(1450u, params.quic_max_packet_length);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, QuicVersionFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   std::string version =
       net::QuicVersionToString(net::QuicSupportedVersions().back());
   command_line_.AppendSwitchASCII("quic-version", version);
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   net::QuicVersionVector supported_versions;
   supported_versions.push_back(net::QuicSupportedVersions().back());
   EXPECT_EQ(supported_versions, params.quic_supported_versions);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, QuicVersionFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["quic_version"] =
       net::QuicVersionToString(net::QuicSupportedVersions().back());
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   net::QuicVersionVector supported_versions;
   supported_versions.push_back(net::QuicSupportedVersions().back());
   EXPECT_EQ(supported_versions, params.quic_supported_versions);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, QuicConnectionOptionsFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitchASCII("quic-connection-options",
                                   "PACE,TIME,TBBR,REJ");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
 
   net::QuicTagVector options;
   options.push_back(net::kPACE);
   options.push_back(net::kTIME);
   options.push_back(net::kTBBR);
   options.push_back(net::kREJ);
   EXPECT_EQ(options, params.quic_connection_options);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, QuicConnectionOptionsFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["connection_options"] = "PACE,TIME,TBBR,REJ";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
 
   net::QuicTagVector options;
   options.push_back(net::kPACE);
   options.push_back(net::kTIME);
   options.push_back(net::kTBBR);
   options.push_back(net::kREJ);
   EXPECT_EQ(options, params.quic_connection_options);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
-}
-
-TEST_F(IOThreadTest, QuicConnectionOptionsFromDeprecatedFieldTrialParams) {
-  field_trial_group_ = "Enabled";
-  field_trial_params_["congestion_options"] = "PACE,TIME,TBBR,REJ";
-
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-
-  net::QuicTagVector options;
-  options.push_back(net::kPACE);
-  options.push_back(net::kTIME);
-  options.push_back(net::kTBBR);
-  options.push_back(net::kREJ);
-  EXPECT_EQ(options, params.quic_connection_options);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest,
        QuicAlwaysRequireHandshakeConfirmationFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["always_require_handshake_confirmation"] = "true";
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.quic_always_require_handshake_confirmation);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest,
        QuicDisableConnectionPoolingFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["disable_connection_pooling"] = "true";
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.quic_disable_connection_pooling);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, QuicLoadServerInfoTimeoutFromFieldTrialParams) {
   field_trial_group_ = "Enabled";
   field_trial_params_["load_server_info_timeout"] = "50";
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(50, params.quic_load_server_info_timeout_ms);
-  EXPECT_FALSE(params.quic_disable_loading_server_info_for_new_servers);
 }
 
 TEST_F(IOThreadTest, QuicDisableLoadingServerInfoForNewServers) {
   field_trial_group_ = "Enabled";
   field_trial_params_["disable_loading_server_info_for_new_servers"] = "true";
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.quic_disable_loading_server_info_for_new_servers);
 }
@@ skipping 42 matching lines @@
   field_trial_group_ = "Enabled";
   field_trial_params_["alternate_protocol_probability_threshold"] = ".5";
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_EQ(.5, params.alternate_protocol_probability_threshold);
 }
 
 }  // namespace test