Index: net/http/http_network_session.cc |
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc |
index b63881d4c0a4952ca6768234bd6e55cf8c4dfd8d..5270e5dc20877916f0df3b1350ffde1ce2510cd3 100644 |
--- a/net/http/http_network_session.cc |
+++ b/net/http/http_network_session.cc |
@@ -366,17 +366,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 { |