Add flag to enable alternative services.

chrome/browser/io_thread.cc

 // Copyright (c) 2012 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 "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 1116 matching lines @@
     base::StringPiece quic_trial_group,
     const VariationParameters& quic_trial_params,
     bool quic_allowed_by_policy,
     IOThread::Globals* globals) {
   bool enable_quic = ShouldEnableQuic(command_line, quic_trial_group,
                                       quic_allowed_by_policy);
   globals->enable_quic.set(enable_quic);
   bool enable_quic_for_proxies = ShouldEnableQuicForProxies(
       command_line, quic_trial_group, quic_allowed_by_policy);
   globals->enable_quic_for_proxies.set(enable_quic_for_proxies);
+  globals->use_alternative_services.set(
+      ShouldQuicEnableAlternativeServices(command_line, quic_trial_params));
   if (enable_quic) {
     globals->enable_insecure_quic.set(
         ShouldEnableInsecureQuic(command_line, quic_trial_params));
     globals->quic_always_require_handshake_confirmation.set(
         ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params));
     globals->quic_disable_connection_pooling.set(
         ShouldQuicDisableConnectionPooling(quic_trial_params));
     int receive_buffer_size = GetQuicSocketReceiveBufferSize(quic_trial_params);
     if (receive_buffer_size != 0) {
       globals->quic_socket_receive_buffer_size.set(receive_buffer_size);
     }
     float load_server_info_timeout_srtt_multiplier =
         GetQuicLoadServerInfoTimeoutSrttMultiplier(quic_trial_params);
     if (load_server_info_timeout_srtt_multiplier != 0) {
       globals->quic_load_server_info_timeout_srtt_multiplier.set(
           load_server_info_timeout_srtt_multiplier);
     }
     globals->quic_enable_connection_racing.set(
         ShouldQuicEnableConnectionRacing(quic_trial_params));
     globals->quic_enable_non_blocking_io.set(
         ShouldQuicEnableNonBlockingIO(quic_trial_params));
     globals->quic_disable_disk_cache.set(
         ShouldQuicDisableDiskCache(quic_trial_params));
     globals->quic_prefer_aes.set(
         ShouldQuicPreferAes(quic_trial_params));
-    globals->use_alternative_services.set(
-        ShouldQuicEnableAlternativeServices(quic_trial_params));
     int max_number_of_lossy_connections = GetQuicMaxNumberOfLossyConnections(
         quic_trial_params);
     if (max_number_of_lossy_connections != 0) {
       globals->quic_max_number_of_lossy_connections.set(
           max_number_of_lossy_connections);
     }
     float packet_loss_threshold = GetQuicPacketLossThreshold(quic_trial_params);
     if (packet_loss_threshold != 0)
       globals->quic_packet_loss_threshold.set(packet_loss_threshold);
     globals->enable_quic_port_selection.set(
@@ skipping 191 matching lines @@
       GetVariationParam(quic_trial_params, "disable_disk_cache"), "true");
 }
 
 bool IOThread::ShouldQuicPreferAes(
     const VariationParameters& quic_trial_params) {
   return base::LowerCaseEqualsASCII(
       GetVariationParam(quic_trial_params, "prefer_aes"), "true");
 }
 
 bool IOThread::ShouldQuicEnableAlternativeServices(
+    const base::CommandLine& command_line,
     const VariationParameters& quic_trial_params) {
-  return base::LowerCaseEqualsASCII(
-      GetVariationParam(quic_trial_params, "use_alternative_services"), "true");
+  return command_line.HasSwitch(switches::kEnableAlternativeServices) ||
+         base::LowerCaseEqualsASCII(
+             GetVariationParam(quic_trial_params, "use_alternative_services"),
+             "true");
 }
 
 int IOThread::GetQuicMaxNumberOfLossyConnections(
     const VariationParameters& quic_trial_params) {
   int value;
   if (base::StringToInt(GetVariationParam(quic_trial_params,
                                           "max_number_of_lossy_connections"),
                         &value)) {
     return value;
   }
@@ skipping 190 matching lines @@
   globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass();
 
   context->set_job_factory(
       globals->proxy_script_fetcher_url_request_job_factory.get());
 
   // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
   // system URLRequestContext too. There's no reason this should be tied to a
   // profile.
   return context;
 }