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

Unified Diff: net/socket/ssl_client_socket_pool.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address wtc's comments Created 8 years, 9 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/socket/ssl_client_socket.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.cc
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 71a5b0dbf1ae5230879df6b550d1ba354a82cc34..e3af15924030fb8820ea596b23d9bef47ac2e89f 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -295,16 +295,16 @@ int SSLConnectJob::DoSSLConnectComplete(int result) {
// If we want spdy over npn, make sure it succeeded.
if (status == SSLClientSocket::kNextProtoNegotiated) {
ssl_socket_->set_was_npn_negotiated(true);
- SSLClientSocket::NextProto protocol_negotiated =
+ NextProto protocol_negotiated =
SSLClientSocket::NextProtoFromString(proto);
ssl_socket_->set_protocol_negotiated(protocol_negotiated);
// If we negotiated either version of SPDY, we must have
// advertised it, so allow it.
// TODO(mbelshe): verify it was a protocol we advertised?
- if (protocol_negotiated == SSLClientSocket::kProtoSPDY1 ||
- protocol_negotiated == SSLClientSocket::kProtoSPDY2 ||
- protocol_negotiated == SSLClientSocket::kProtoSPDY21 ||
- protocol_negotiated == SSLClientSocket::kProtoSPDY3) {
+ if (protocol_negotiated == kProtoSPDY1 ||
+ protocol_negotiated == kProtoSPDY2 ||
+ protocol_negotiated == kProtoSPDY21 ||
+ protocol_negotiated == kProtoSPDY3) {
ssl_socket_->set_was_spdy_negotiated(true);
}
}
« no previous file with comments | « net/socket/ssl_client_socket.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698