| Index: net/socket/ssl_client_socket_nss.h
|
| diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
|
| index 08602760436defb685c6042fdbdba31ba9b66f54..666937c67a2b22d9196ca3f0756b69d3ffb53e44 100644
|
| --- a/net/socket/ssl_client_socket_nss.h
|
| +++ b/net/socket/ssl_client_socket_nss.h
|
| @@ -66,7 +66,7 @@ class SSLClientSocketNSS : public SSLClientSocket {
|
| const base::StringPiece& context,
|
| unsigned char* out,
|
| unsigned int outlen) OVERRIDE;
|
| - virtual NextProtoStatus GetNextProto(std::string* proto,
|
| + virtual SSLClientSocket::NextProtoStatus GetNextProto(std::string* proto,
|
| std::string* server_protos) OVERRIDE;
|
|
|
| // StreamSocket implementation.
|
| @@ -301,7 +301,7 @@ class SSLClientSocketNSS : public SSLClientSocket {
|
|
|
| // next_proto_ is the protocol that we selected by NPN.
|
| std::string next_proto_;
|
| - NextProtoStatus next_proto_status_;
|
| + SSLClientSocket::NextProtoStatus next_proto_status_;
|
| // Server's NPN advertised protocols.
|
| std::string server_protos_;
|
|
|
|
|