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

Unified Diff: net/http/http_network_session.cc

Issue 2140733002: Remove HttpStreamFactory::spdy_enabled_ static member and accessors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 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 | « components/policy/resources/policy_templates.json ('k') | net/http/http_stream_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_session.cc
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index bf2828f40d9ecda502a71d3ca1cba618e3f8e975..cbac7db0f14836f03f746e96113aeb1288453d0b 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -364,17 +364,7 @@ bool HttpNetworkSession::IsProtocolEnabled(AlternateProtocol protocol) const {
}
void HttpNetworkSession::GetAlpnProtos(NextProtoVector* alpn_protos) const {
- if (HttpStreamFactory::spdy_enabled()) {
- *alpn_protos = next_protos_;
- } else {
- // HttpStreamFactory::spdy_enabled() only affects SPDY/3.1,
- // but not other ALPN protocols.
- alpn_protos->clear();
- for (auto proto : next_protos_) {
- if (proto != kProtoSPDY31)
- alpn_protos->push_back(proto);
- }
- }
+ *alpn_protos = next_protos_;
}
void HttpNetworkSession::GetNpnProtos(NextProtoVector* npn_protos) const {
« no previous file with comments | « components/policy/resources/policy_templates.json ('k') | net/http/http_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698