Index: net/socket/socket_test_util.cc |
=================================================================== |
--- net/socket/socket_test_util.cc (revision 112817) |
+++ net/socket/socket_test_util.cc (working copy) |
@@ -692,8 +692,9 @@ |
} |
SSLClientSocket::NextProtoStatus |
-MockClientSocket::GetNextProto(std::string* proto) { |
+MockClientSocket::GetNextProto(std::string* proto, std::string* server_proto) { |
proto->clear(); |
+ server_proto->clear(); |
return SSLClientSocket::kNextProtoUnsupported; |
} |
@@ -1154,8 +1155,9 @@ |
} |
SSLClientSocket::NextProtoStatus MockSSLClientSocket::GetNextProto( |
- std::string* proto) { |
+ std::string* proto, std::string* server_proto) { |
agl
2011/12/05 16:38:10
s
ramant (doing other things)
2011/12/05 19:03:28
Done.
|
*proto = data_->next_proto; |
+ *server_proto = data_->protos; |
agl
2011/12/05 16:38:10
s
ramant (doing other things)
2011/12/05 19:03:28
Done.
|
return data_->next_proto_status; |
} |