| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index f015bc1ffad26d3d31e7e432b0664bd91efd33b2..819fdf87ee9344da61a89f0cf338500d44d1de9e 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -984,10 +984,6 @@ void IOThread::ConfigureSpdyGlobals(
|
| base::StringPiece spdy_trial_group,
|
| const VariationParameters& spdy_trial_params,
|
| IOThread::Globals* globals) {
|
| - if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) {
|
| - globals->trusted_spdy_proxy.set(
|
| - command_line.GetSwitchValueASCII(switches::kTrustedSpdyProxy));
|
| - }
|
| if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests))
|
| net::URLFetcher::SetIgnoreCertificateRequests(true);
|
|
|
| @@ -1170,7 +1166,6 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
|
| ¶ms->spdy_default_protocol);
|
| globals.enable_spdy31.CopyToIfSet(¶ms->enable_spdy31);
|
| globals.enable_http2.CopyToIfSet(¶ms->enable_http2);
|
| - globals.trusted_spdy_proxy.CopyToIfSet(¶ms->trusted_spdy_proxy);
|
| params->forced_spdy_exclusions = globals.forced_spdy_exclusions;
|
| globals.parse_alternative_services.CopyToIfSet(
|
| ¶ms->parse_alternative_services);
|
|
|