Enable AltSvc pooling by default.

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 <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 981 matching lines @@
     net::HttpStreamFactory::set_spdy_enabled(spdy_enabled);
     return;
   }
 }
 
 // static
 void IOThread::NetworkSessionConfigurator::ConfigureAltSvcParams(
     const base::CommandLine& command_line,
     base::StringPiece altsvc_trial_group,
     net::HttpNetworkSession::Params* params) {
-  if (command_line.HasSwitch(switches::kEnableAlternativeServices) ||
-      altsvc_trial_group.starts_with(kAltSvcFieldTrialEnabledPrefix)) {
+  if (altsvc_trial_group.starts_with(kAltSvcFieldTrialEnabledPrefix)) {
     params->parse_alternative_services = true;
     return;
   }
   if (altsvc_trial_group.starts_with(kAltSvcFieldTrialDisabledPrefix)) {
     params->parse_alternative_services = false;
   }
 }
 
 // static
 void IOThread::NetworkSessionConfigurator::ConfigureNPNParams(
@@ skipping 161 matching lines @@
     const base::CommandLine& command_line,
     base::StringPiece quic_trial_group,
     const VariationParameters& quic_trial_params,
     bool is_quic_allowed_by_policy,
     net::HttpNetworkSession::Params* params) {
   params->enable_quic = ShouldEnableQuic(command_line, quic_trial_group,
                                          is_quic_allowed_by_policy);
   params->disable_quic_on_timeout_with_open_streams =
       ShouldDisableQuicWhenConnectionTimesOutWithOpenStreams(quic_trial_params);
 
-  if (ShouldQuicEnableAlternativeServicesForDifferentHost(command_line,
-                                                          quic_trial_params)) {
-    params->enable_alternative_service_with_different_host = true;
-    params->parse_alternative_services = true;
-  } else {
-    params->enable_alternative_service_with_different_host = false;
-  }
+  params->enable_alternative_service_with_different_host =
+      ShouldQuicEnableAlternativeServicesForDifferentHost(command_line,
+                                                          quic_trial_params);
 
   if (params->enable_quic) {
     params->quic_always_require_handshake_confirmation =
         ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params);
     params->quic_disable_connection_pooling =
         ShouldQuicDisableConnectionPooling(quic_trial_params);
     int receive_buffer_size = GetQuicSocketReceiveBufferSize(quic_trial_params);
     if (receive_buffer_size != 0) {
       params->quic_socket_receive_buffer_size = receive_buffer_size;
     }
@@ skipping 191 matching lines @@
     const VariationParameters& quic_trial_params) {
   return base::LowerCaseEqualsASCII(
       GetVariationParam(quic_trial_params, "prefer_aes"), "true");
 }
 
 // static
 bool IOThread::NetworkSessionConfigurator::
     ShouldQuicEnableAlternativeServicesForDifferentHost(
         const base::CommandLine& command_line,
         const VariationParameters& quic_trial_params) {
-  // TODO(bnc): Remove inaccurately named "use_alternative_services" parameter.
-  return command_line.HasSwitch(switches::kEnableAlternativeServices) ||
-         base::LowerCaseEqualsASCII(
-             GetVariationParam(quic_trial_params, "use_alternative_services"),
-             "true") ||
-         base::LowerCaseEqualsASCII(
-             GetVariationParam(
-                 quic_trial_params,
-                 "enable_alternative_service_with_different_host"),
-             "true");
+  return !base::LowerCaseEqualsASCII(
+      GetVariationParam(quic_trial_params,
+                        "enable_alternative_service_with_different_host"),
+      "false");
 }
 
 // static
 int IOThread::NetworkSessionConfigurator::GetQuicMaxNumberOfLossyConnections(
     const VariationParameters& quic_trial_params) {
   int value;
   if (base::StringToInt(GetVariationParam(quic_trial_params,
                                           "max_number_of_lossy_connections"),
                         &value)) {
     return value;
@@ skipping 284 matching lines @@
   // 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;
 }
 
 const metrics::UpdateUsagePrefCallbackType&
 IOThread::GetMetricsDataUseForwarder() {
   return metrics_data_use_forwarder_;
 }