| 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 a15c0e3b9684502d090ee0de3fa7d1dbd5684b99..e1e177802f03d46a082fd51a4583cce7783640ef 100644
|
| --- a/net/socket/ssl_client_socket_openssl.h
|
| +++ b/net/socket/ssl_client_socket_openssl.h
|
| @@ -63,7 +63,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| std::string* server_protos);
|
|
|
| // StreamSocket implementation.
|
| - virtual int Connect(OldCompletionCallback* callback);
|
| virtual int Connect(const CompletionCallback& callback);
|
| virtual void Disconnect();
|
| virtual bool IsConnected() const;
|
| @@ -79,10 +78,10 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| virtual base::TimeDelta GetConnectTimeMicros() const;
|
|
|
| // Socket implementation.
|
| - virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| virtual int Read(IOBuffer* buf, int buf_len,
|
| const CompletionCallback& callback);
|
| - virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| + virtual int Write(IOBuffer* buf, int buf_len,
|
| + const CompletionCallback& callback);
|
| virtual bool SetReceiveBufferSize(int32 size);
|
| virtual bool SetSendBufferSize(int32 size);
|
|
|
| @@ -115,18 +114,14 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
|
| void TransportWriteComplete(int result);
|
| void TransportReadComplete(int result);
|
|
|
| - OldCompletionCallbackImpl<SSLClientSocketOpenSSL> buffer_send_callback_;
|
| - OldCompletionCallbackImpl<SSLClientSocketOpenSSL> buffer_recv_callback_;
|
| bool transport_send_busy_;
|
| scoped_refptr<DrainableIOBuffer> send_buffer_;
|
| bool transport_recv_busy_;
|
| scoped_refptr<IOBuffer> recv_buffer_;
|
|
|
| - OldCompletionCallback* old_user_connect_callback_;
|
| CompletionCallback user_connect_callback_;
|
| - OldCompletionCallback* old_user_read_callback_;
|
| CompletionCallback user_read_callback_;
|
| - OldCompletionCallback* user_write_callback_;
|
| + CompletionCallback user_write_callback_;
|
|
|
| // Used by Read function.
|
| scoped_refptr<IOBuffer> user_read_buf_;
|
|
|