Rename methods and members and const variables to alternative service.

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 097e8a67ddc54ddc1b8c0879683e4bc0dbb0ec82..d439f832e180dc403f2458665c7f44c815df6f7c 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -327,8 +327,6 @@ bool IsCertificateTransparencyRequiredForEV(
 //   "exclude=<host>"           : Disables SPDY support for the host <host>.
 //   "no-compress"              : Disables SPDY header compression.
 //   "no-alt-protocols          : Disables alternate protocol support.
-//   "force-alt-protocols       : Forces an alternate protocol of SPDY/3
-//                                on port 443.
 //   "init-max-streams=<limit>" : Specifies the maximum number of concurrent
 //                                streams for a SPDY session, unless the
 //                                specifies a different value via SETTINGS.
@@ -1159,8 +1157,8 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
   params->forced_spdy_exclusions = globals.forced_spdy_exclusions;
   globals.use_alternate_protocols.CopyToIfSet(
       &params->use_alternate_protocols);
-  globals.alternate_protocol_probability_threshold.CopyToIfSet(
-      &params->alternate_protocol_probability_threshold);
+  globals.alternative_service_probability_threshold.CopyToIfSet(
+      &params->alternative_service_probability_threshold);
 
   globals.enable_quic.CopyToIfSet(&params->enable_quic);
   globals.enable_quic_for_proxies.CopyToIfSet(&params->enable_quic_for_proxies);
@@ -1355,11 +1353,11 @@ void IOThread::ConfigureQuicGlobals(
     globals->quic_supported_versions.set(supported_versions);
   }
 
-  double threshold =
-      GetAlternateProtocolProbabilityThreshold(command_line, quic_trial_params);
+  double threshold = GetAlternativeProtocolProbabilityThreshold(
+      command_line, quic_trial_params);
   if (threshold >=0 && threshold <= 1) {
-    globals->alternate_protocol_probability_threshold.set(threshold);
-    globals->http_server_properties->SetAlternateProtocolProbabilityThreshold(
+    globals->alternative_service_probability_threshold.set(threshold);
+    globals->http_server_properties->SetAlternativeServiceProbabilityThreshold(
         threshold);
   }
 
@@ -1447,15 +1445,15 @@ net::QuicTagVector IOThread::GetQuicConnectionOptions(
 }
 
 // static
-double IOThread::GetAlternateProtocolProbabilityThreshold(
+double IOThread::GetAlternativeProtocolProbabilityThreshold(
     const base::CommandLine& command_line,
     const VariationParameters& quic_trial_params) {
   double value;
   if (command_line.HasSwitch(
-          switches::kAlternateProtocolProbabilityThreshold)) {
+          switches::kAlternativeServiceProbabilityThreshold)) {
     if (base::StringToDouble(
             command_line.GetSwitchValueASCII(
-                switches::kAlternateProtocolProbabilityThreshold),
+                switches::kAlternativeServiceProbabilityThreshold),
             &value)) {
       return value;
     }
@@ -1465,7 +1463,7 @@ double IOThread::GetAlternateProtocolProbabilityThreshold(
   }
   if (base::StringToDouble(
           GetVariationParam(quic_trial_params,
-                            "alternate_protocol_probability_threshold"),
+                            "alternative_service_probability_threshold"),

[Ryan Hamilton, 2015/04/24 14:35:59]

This change will break our existing finch configurations. Please revert (or at
least add fallback to the old key).

[Bence, 2015/04/24 21:36:02]

Good catch.  Done.

           &value)) {
     return value;
   }