| 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 434b7c67b90873ec916873cc5773898a12b57983..ba34a2c42731ce59fb1bd782b1219c0372a9c03a 100644
|
| --- a/net/socket/ssl_client_socket_nss.h
|
| +++ b/net/socket/ssl_client_socket_nss.h
|
| @@ -68,13 +68,16 @@ class SSLClientSocketNSS : public SSLClientSocket {
|
| // SSLClientSocket implementation.
|
| virtual void GetSSLCertRequestInfo(
|
| SSLCertRequestInfo* cert_request_info) OVERRIDE;
|
| + virtual NextProtoStatus GetNextProto(std::string* proto,
|
| + std::string* server_protos) OVERRIDE;
|
| +
|
| + // SSLSocket implementation.
|
| virtual int ExportKeyingMaterial(const base::StringPiece& label,
|
| bool has_context,
|
| const base::StringPiece& context,
|
| unsigned char* out,
|
| unsigned int outlen) OVERRIDE;
|
| - virtual NextProtoStatus GetNextProto(std::string* proto,
|
| - std::string* server_protos) OVERRIDE;
|
| + virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE;
|
|
|
| // StreamSocket implementation.
|
| virtual int Connect(const CompletionCallback& callback) OVERRIDE;
|
|
|