Rename methods and members and const variables to alternative service.

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 f2820d905e3e40a7dc8273b49f7a5d311967af99..990231566a914287466465758b03b7185d5e2f28 100644
--- a/chrome/browser/io_thread_unittest.cc
+++ b/chrome/browser/io_thread_unittest.cc
@@ -193,7 +193,7 @@ TEST_F(IOThreadTest, EnableQuicFromFieldTrialGroup) {
   EXPECT_TRUE(params.enable_quic);
   EXPECT_TRUE(params.enable_quic_for_proxies);
   EXPECT_EQ(1350u, params.quic_max_packet_length);
-  EXPECT_EQ(1.0, params.alternate_protocol_probability_threshold);
+  EXPECT_EQ(1.0, params.alternative_service_probability_threshold);
   EXPECT_EQ(default_params.quic_supported_versions,
             params.quic_supported_versions);
   EXPECT_EQ(net::QuicTagVector(), params.quic_connection_options);
@@ -421,36 +421,45 @@ TEST_F(IOThreadTest, QuicReceiveBufferSize) {
   EXPECT_EQ(1048576, params.quic_socket_receive_buffer_size);
 }
 
-TEST_F(IOThreadTest,
-       AlternateProtocolProbabilityThresholdFromFlag) {
-  command_line_.AppendSwitchASCII("alternate-protocol-probability-threshold",
-                                  ".5");
+TEST_F(IOThreadTest, AlternativeServiceProbabilityThresholdFromFlag) {
+  command_line_.AppendSwitchASCII("alternative-service-probability-threshold",
+                                  "0.5");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
-  EXPECT_EQ(.5, params.alternate_protocol_probability_threshold);
+  EXPECT_EQ(.5, params.alternative_service_probability_threshold);
 }
 
-TEST_F(IOThreadTest,
-       AlternateProtocolProbabilityThresholdFromEnableQuicFlag) {
+TEST_F(IOThreadTest, AlternativeServiceProbabilityThresholdFromEnableQuicFlag) {
   command_line_.AppendSwitch("enable-quic");
 
   ConfigureQuicGlobals();
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
-  EXPECT_EQ(0, params.alternate_protocol_probability_threshold);
+  EXPECT_EQ(0, params.alternative_service_probability_threshold);
 }
 
-TEST_F(IOThreadTest,
-       AlternateProtocolProbabilityThresholdFromParams) {
+// TODO(bnc): Remove when new parameter name rolls out and server configuration
+// is changed.
+TEST_F(IOThreadTest, AlternativeServiceProbabilityThresholdFromOldParams) {
   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);
+  EXPECT_EQ(.5, params.alternative_service_probability_threshold);
+}
+
+TEST_F(IOThreadTest, AlternativeServiceProbabilityThresholdFromParams) {
+  field_trial_group_ = "Enabled";
+  field_trial_params_["alternative_service_probability_threshold"] = ".5";
+
+  ConfigureQuicGlobals();
+  net::HttpNetworkSession::Params params;
+  InitializeNetworkSessionParams(&params);
+  EXPECT_EQ(.5, params.alternative_service_probability_threshold);
 }
 
 }  // namespace test