| 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 {
|
|
|