Index: net/socket/ssl_client_socket_win.h |
diff --git a/net/socket/ssl_client_socket_win.h b/net/socket/ssl_client_socket_win.h |
index d4cabf9824101c283600bc7c966d0b490080d313..0839b4c2416bc5a64bbba52046f6d53b20e2ba9c 100644 |
--- a/net/socket/ssl_client_socket_win.h |
+++ b/net/socket/ssl_client_socket_win.h |
@@ -45,7 +45,7 @@ class SSLClientSocketWin : public SSLClientSocket { |
const SSLClientSocketContext& context); |
~SSLClientSocketWin(); |
- // SSLClientSocket methods: |
+ // SSLClientSocket implementation. |
virtual void GetSSLInfo(SSLInfo* ssl_info); |
virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info); |
virtual int ExportKeyingMaterial(const base::StringPiece& label, |
@@ -54,8 +54,9 @@ class SSLClientSocketWin : 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; |
@@ -69,7 +70,7 @@ class SSLClientSocketWin : 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); |
@@ -120,7 +121,8 @@ class SSLClientSocketWin : public SSLClientSocket { |
SSLConfig ssl_config_; |
// User function to callback when the Connect() completes. |
- OldCompletionCallback* user_connect_callback_; |
+ OldCompletionCallback* old_user_connect_callback_; |
+ CompletionCallback user_connect_callback_; |
// User function to callback when a Read() completes. |
OldCompletionCallback* user_read_callback_; |