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

Unified Diff: net/http/http_stream_factory_impl.cc

Issue 284423002: Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge Created 6 years, 7 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
« no previous file with comments | « net/http/http_stream_factory.cc ('k') | net/http/http_stream_factory_impl_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl.cc
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
index 7500373eeb485e82774654ddb4963fa710c54d6f..d964ab4fe1ef148a9f4512dc85cabec7d004c3b5 100644
--- a/net/http/http_stream_factory_impl.cc
+++ b/net/http/http_stream_factory_impl.cc
@@ -190,7 +190,7 @@ const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const {
PortAlternateProtocolPair HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
const GURL& original_url,
GURL* alternate_url) {
- if (!use_alternate_protocols())
+ if (!session_->params().use_alternate_protocols)
return kNoAlternateProtocol;
if (original_url.SchemeIs("ftp"))
@@ -231,10 +231,10 @@ PortAlternateProtocolPair HttpStreamFactoryImpl::GetAlternateProtocolRequestFor(
origin.set_port(alternate.port);
if (alternate.protocol >= NPN_SPDY_MINIMUM_VERSION &&
alternate.protocol <= NPN_SPDY_MAXIMUM_VERSION) {
- if (!spdy_enabled())
+ if (!HttpStreamFactory::spdy_enabled())
return kNoAlternateProtocol;
- if (HttpStreamFactory::HasSpdyExclusion(origin))
+ if (session_->HasSpdyExclusion(origin))
return kNoAlternateProtocol;
*alternate_url = UpgradeUrlToHttps(original_url, alternate.port);
« no previous file with comments | « net/http/http_stream_factory.cc ('k') | net/http/http_stream_factory_impl_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698