| 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);
|
| }
|
| }
|
|
|