Clean up QUIC field trial parsing code.

chrome/browser/io_thread_unittest.cc

Index: chrome/browser/io_thread_unittest.cc
diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc
index 11f6a697c6c14f0d47b34bc7b48b8922b740de6e..47bb66bb7e08bb9917e16c719ec9991eb7f26382 100644
--- a/chrome/browser/io_thread_unittest.cc
+++ b/chrome/browser/io_thread_unittest.cc
@@ -144,7 +144,6 @@ TEST_F(IOThreadTest, EnableQuicFromCommandLine) {
   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) {
@@ -157,7 +156,6 @@ TEST_F(IOThreadTest, EnablePacingFromCommandLine) {
   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) {
@@ -170,7 +168,6 @@ TEST_F(IOThreadTest, EnablePacingFromFieldTrialParams) {
   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) {
@@ -181,7 +178,6 @@ TEST_F(IOThreadTest, PacketLengthFromCommandLine) {
   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) {
@@ -192,7 +188,6 @@ TEST_F(IOThreadTest, PacketLengthFromFieldTrialParams) {
   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) {
@@ -207,7 +202,6 @@ TEST_F(IOThreadTest, QuicVersionFromCommandLine) {
   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) {
@@ -221,7 +215,6 @@ TEST_F(IOThreadTest, QuicVersionFromFieldTrialParams) {
   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) {
@@ -239,7 +232,6 @@ TEST_F(IOThreadTest, QuicConnectionOptionsFromCommandLine) {
   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) {
@@ -256,24 +248,6 @@ TEST_F(IOThreadTest, QuicConnectionOptionsFromFieldTrialParams) {
   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,
@@ -284,7 +258,6 @@ TEST_F(IOThreadTest,
   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,
@@ -295,7 +268,6 @@ TEST_F(IOThreadTest,
   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) {
@@ -305,7 +277,6 @@ TEST_F(IOThreadTest, QuicLoadServerInfoTimeoutFromFieldTrialParams) {
   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) {