Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1302)

Unified Diff: chrome/browser/io_thread.cc

Issue 1268313004: s/use_alternate_protocols/use_alternative_services/g (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index f5d30e33c119380c722346919143ffdbb04a3a25..a4393ce522ea1270a6ca33918123828cfe8abcef 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -344,7 +344,7 @@ void ConfigureSpdyGlobalsFromUseSpdyArgument(const std::string& mode,
continue;
}
if (option == kDisableAltProtocols) {
- globals->use_alternate_protocols.set(false);
+ globals->use_alternative_services.set(false);
continue;
}
if (option == kInitialMaxConcurrentStreams) {
@@ -996,14 +996,14 @@ void IOThread::ConfigureSpdyGlobals(
}
if (spdy_trial_group.starts_with(kSpdyFieldTrialSpdy31GroupNamePrefix)) {
globals->next_protos.push_back(net::kProtoSPDY31);
- globals->use_alternate_protocols.set(true);
+ globals->use_alternative_services.set(true);
return;
}
if (spdy_trial_group.starts_with(kSpdyFieldTrialSpdy4GroupNamePrefix)) {
globals->next_protos.push_back(net::kProtoSPDY31);
globals->next_protos.push_back(net::kProtoHTTP2_14);
globals->next_protos.push_back(net::kProtoHTTP2);
- globals->use_alternate_protocols.set(true);
+ globals->use_alternative_services.set(true);
return;
}
if (spdy_trial_group.starts_with(kSpdyFieldTrialParametrizedPrefix)) {
@@ -1026,7 +1026,7 @@ void IOThread::ConfigureSpdyGlobals(
// TODO(bnc): HttpStreamFactory::spdy_enabled_ is redundant with
// globals->next_protos, can it be eliminated?
net::HttpStreamFactory::set_spdy_enabled(spdy_enabled);
- globals->use_alternate_protocols.set(true);
+ globals->use_alternative_services.set(true);
return;
}
@@ -1034,7 +1034,7 @@ void IOThread::ConfigureSpdyGlobals(
globals->next_protos.push_back(net::kProtoSPDY31);
globals->next_protos.push_back(net::kProtoHTTP2_14);
globals->next_protos.push_back(net::kProtoHTTP2);
- globals->use_alternate_protocols.set(true);
+ globals->use_alternative_services.set(true);
}
// static
@@ -1128,8 +1128,8 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
params->next_protos = globals.next_protos;
globals.trusted_spdy_proxy.CopyToIfSet(&params->trusted_spdy_proxy);
params->forced_spdy_exclusions = globals.forced_spdy_exclusions;
- globals.use_alternate_protocols.CopyToIfSet(
- &params->use_alternate_protocols);
+ globals.use_alternative_services.CopyToIfSet(
+ &params->use_alternative_services);
globals.alternative_service_probability_threshold.CopyToIfSet(
&params->alternative_service_probability_threshold);

Powered by Google App Engine
This is Rietveld 408576698