| Index: net/socket/ssl_client_socket_openssl.h
|
| diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
|
| index f2739d4a21e37b60d5d456988b7e71ecad303c87..5c0f6b49f1a6155e9a85b8507e81cf6d6a464add 100644
|
| --- a/net/socket/ssl_client_socket_openssl.h
|
| +++ b/net/socket/ssl_client_socket_openssl.h
|
| @@ -63,7 +63,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| const base::StringPiece& context,
|
| unsigned char* out,
|
| unsigned int outlen);
|
| - virtual NextProtoStatus GetNextProto(std::string* proto,
|
| + virtual SSLClientSocket::NextProtoStatus GetNextProto(std::string* proto,
|
| std::string* server_protos);
|
| virtual ServerBoundCertService* GetServerBoundCertService() const;
|
|
|
| @@ -171,7 +171,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| STATE_VERIFY_CERT_COMPLETE,
|
| };
|
| State next_handshake_state_;
|
| - NextProtoStatus npn_status_;
|
| + SSLClientSocket::NextProtoStatus npn_status_;
|
| std::string npn_proto_;
|
| std::string server_protos_;
|
| BoundNetLog net_log_;
|
|
|