Enable AltSvc pooling by default.

components/network_session_configurator/network_session_configurator.cc

 // Copyright 2016 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 "components/network_session_configurator/network_session_configurator.h"
 
 #include <map>
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 139 matching lines @@
     // HttpStreamFactory::spdy_enabled_ is redundant with params->enable_http2
     // and enable_spdy31, can it be eliminated?
     net::HttpStreamFactory::set_spdy_enabled(spdy_enabled);
     return;
   }
 }
 
 void 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;
   }
 }
 
 void ConfigureNPNParams(const base::CommandLine& command_line,
                         base::StringPiece npn_trial_group,
@@ skipping 42 matching lines @@
 bool ShouldQuicDisableConnectionPooling(
     const VariationParameters& quic_trial_params) {
   return base::LowerCaseEqualsASCII(
       GetVariationParam(quic_trial_params, "disable_connection_pooling"),
       "true");
 }
 
 bool 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");
 }
 
 bool ShouldEnableQuicPortSelection(const base::CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kDisableQuicPortSelection))
     return false;
 
   if (command_line.HasSwitch(switches::kEnableQuicPortSelection))
     return true;
 
   return false;  // Default to disabling port selection on all channels.
@@ skipping 196 matching lines @@
                          base::StringPiece quic_trial_group,
                          const VariationParameters& quic_trial_params,
                          bool is_quic_allowed_by_policy,
                          const std::string& quic_user_agent_id,
                          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 148 matching lines @@
                                     const std::string& quic_user_agent_id,
                                     net::HttpNetworkSession::Params* params) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   ParseFieldTrialsAndCommandLineInternal(
       command_line, is_spdy_allowed_by_policy, is_quic_allowed_by_policy,
       quic_user_agent_id, params);
 }
 
 }  // namespace network_session_configurator