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

Unified Diff: net/http/http_network_session.cc

Issue 794563003: Change next_proto member type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix type in callback. Created 6 years 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: net/http/http_network_session.cc
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 656db549364b96c399a3dc72bb934c29f30dc108..e39920e48d7e388a8315b5d4cbe589fb7364b2bb 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -166,7 +166,7 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
// Add the protocol to the TLS next protocol list, except for QUIC
// since it uses UDP.
if (proto != kProtoQUIC1SPDY3) {
- next_protos_.push_back(SSLClientSocket::NextProtoToString(proto));
+ next_protos_.push_back(proto);
}
// Enable the corresponding alternate protocol, except for HTTP
@@ -284,8 +284,7 @@ bool HttpNetworkSession::IsProtocolEnabled(AlternateProtocol protocol) const {
protocol - ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION];
}
-void HttpNetworkSession::GetNextProtos(
- std::vector<std::string>* next_protos) const {
+void HttpNetworkSession::GetNextProtos(NextProtoVector* next_protos) const {
if (HttpStreamFactory::spdy_enabled()) {
*next_protos = next_protos_;
} else {

Powered by Google App Engine
This is Rietveld 408576698