Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index 11575c2a07a2bbecd9730853d6a3d31ebe15e34f..1e1979b6175dee05ff47739aff66749f4e76de8e 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -1097,8 +1097,6 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals( |
¶ms->parse_alternative_services); |
globals.enable_alternative_service_with_different_host.CopyToIfSet( |
¶ms->enable_alternative_service_with_different_host); |
- globals.alternative_service_probability_threshold.CopyToIfSet( |
- ¶ms->alternative_service_probability_threshold); |
globals.enable_npn.CopyToIfSet(¶ms->enable_npn); |
@@ -1325,14 +1323,6 @@ void IOThread::ConfigureQuicGlobals( |
globals->quic_supported_versions.set(supported_versions); |
} |
- double threshold = GetAlternativeProtocolProbabilityThreshold( |
- command_line, quic_trial_params); |
- if (threshold >=0 && threshold <= 1) { |
- globals->alternative_service_probability_threshold.set(threshold); |
- globals->http_server_properties->SetAlternativeServiceProbabilityThreshold( |
- threshold); |
- } |
- |
if (command_line.HasSwitch(switches::kOriginToForceQuicOn)) { |
net::HostPortPair quic_origin = |
net::HostPortPair::FromString( |
@@ -1410,39 +1400,6 @@ net::QuicTagVector IOThread::GetQuicConnectionOptions( |
return net::QuicUtils::ParseQuicConnectionOptions(it->second); |
} |
-double IOThread::GetAlternativeProtocolProbabilityThreshold( |
- const base::CommandLine& command_line, |
- const VariationParameters& quic_trial_params) { |
- double value; |
- if (command_line.HasSwitch( |
- switches::kAlternativeServiceProbabilityThreshold)) { |
- if (base::StringToDouble( |
- command_line.GetSwitchValueASCII( |
- switches::kAlternativeServiceProbabilityThreshold), |
- &value)) { |
- return value; |
- } |
- } |
- if (command_line.HasSwitch(switches::kEnableQuic)) { |
- return 0; |
- } |
- // TODO(bnc): Remove when new parameter name rolls out and server |
- // configuration is changed. |
- if (base::StringToDouble( |
- GetVariationParam(quic_trial_params, |
- "alternate_protocol_probability_threshold"), |
- &value)) { |
- return value; |
- } |
- if (base::StringToDouble( |
- GetVariationParam(quic_trial_params, |
- "alternative_service_probability_threshold"), |
- &value)) { |
- return value; |
- } |
- return -1; |
-} |
- |
bool IOThread::ShouldQuicAlwaysRequireHandshakeConfirmation( |
const VariationParameters& quic_trial_params) { |
return base::LowerCaseEqualsASCII( |