Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index 60883cd7a02074e2433b8df1345cfefa7b33a960..44a5755307f924783d743e69ad868cb07b805748 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -999,8 +999,7 @@ 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; |
} |
@@ -1182,13 +1181,9 @@ void IOThread::NetworkSessionConfigurator::ConfigureQuicParams( |
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 = |
@@ -1400,16 +1395,10 @@ 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 |