| 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 a09fff474afc8ed9c411a4a24bf9675968694693..d2f4bf6de6eb57e05a84d8583685f7e4d43d675f 100644
|
| --- a/net/socket/ssl_client_socket_openssl.h
|
| +++ b/net/socket/ssl_client_socket_openssl.h
|
| @@ -52,7 +52,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen,
|
| const unsigned char* in, unsigned int inlen);
|
|
|
| - // SSLClientSocket methods:
|
| + // SSLClientSocket implementation.
|
| virtual void GetSSLInfo(SSLInfo* ssl_info);
|
| virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
|
| virtual int ExportKeyingMaterial(const base::StringPiece& label,
|
| @@ -61,8 +61,9 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| unsigned int outlen);
|
| virtual NextProtoStatus GetNextProto(std::string* proto);
|
|
|
| - // StreamSocket methods:
|
| + // StreamSocket implementation.
|
| virtual int Connect(OldCompletionCallback* callback);
|
| + virtual int Connect(const CompletionCallback& callback);
|
| virtual void Disconnect();
|
| virtual bool IsConnected() const;
|
| virtual bool IsConnectedAndIdle() const;
|
| @@ -76,7 +77,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| virtual int64 NumBytesRead() const;
|
| virtual base::TimeDelta GetConnectTimeMicros() const;
|
|
|
| - // Socket methods:
|
| + // Socket implementation.
|
| virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| virtual bool SetReceiveBufferSize(int32 size);
|
| @@ -118,7 +119,8 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| bool transport_recv_busy_;
|
| scoped_refptr<IOBuffer> recv_buffer_;
|
|
|
| - OldCompletionCallback* user_connect_callback_;
|
| + OldCompletionCallback* old_user_connect_callback_;
|
| + CompletionCallback user_connect_callback_;
|
| OldCompletionCallback* user_read_callback_;
|
| OldCompletionCallback* user_write_callback_;
|
|
|
|
|