| Index: net/socket/ssl_client_socket_pool_unittest.cc
|
| ===================================================================
|
| --- net/socket/ssl_client_socket_pool_unittest.cc (revision 112817)
|
| +++ net/socket/ssl_client_socket_pool_unittest.cc (working copy)
|
| @@ -382,7 +382,8 @@
|
| SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle.socket());
|
| EXPECT_TRUE(ssl_socket->was_npn_negotiated());
|
| std::string proto;
|
| - ssl_socket->GetNextProto(&proto);
|
| + std::string server_proto;
|
| + ssl_socket->GetNextProto(&proto, &server_proto);
|
| EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto),
|
| SSLClientSocket::kProtoSPDY2);
|
| }
|
| @@ -414,7 +415,8 @@
|
| SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle.socket());
|
| EXPECT_TRUE(ssl_socket->was_npn_negotiated());
|
| std::string proto;
|
| - ssl_socket->GetNextProto(&proto);
|
| + std::string server_proto;
|
| + ssl_socket->GetNextProto(&proto, &server_proto);
|
| EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto),
|
| SSLClientSocket::kProtoSPDY2);
|
| }
|
| @@ -714,7 +716,8 @@
|
| SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle->socket());
|
| EXPECT_TRUE(ssl_socket->was_npn_negotiated());
|
| std::string proto;
|
| - ssl_socket->GetNextProto(&proto);
|
| + std::string server_proto;
|
| + ssl_socket->GetNextProto(&proto, &server_proto);
|
| EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto),
|
| SSLClientSocket::kProtoSPDY2);
|
|
|
| @@ -801,7 +804,8 @@
|
| SSLClientSocket* ssl_socket = static_cast<SSLClientSocket*>(handle->socket());
|
| EXPECT_TRUE(ssl_socket->was_npn_negotiated());
|
| std::string proto;
|
| - ssl_socket->GetNextProto(&proto);
|
| + std::string server_proto;
|
| + ssl_socket->GetNextProto(&proto, &server_proto);
|
| EXPECT_EQ(SSLClientSocket::NextProtoFromString(proto),
|
| SSLClientSocket::kProtoSPDY2);
|
|
|
|
|