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 1136e61179585af73c7a8f463e81fac24939132a..77bf7a25d2bb1f4cf92211bad5b24aac8fc6613e 100644 |
--- a/net/socket/ssl_client_socket_nss.h |
+++ b/net/socket/ssl_client_socket_nss.h |
@@ -59,7 +59,7 @@ class SSLClientSocketNSS : public SSLClientSocket { |
// For tests |
static void ClearSessionCache(); |
- // SSLClientSocket methods: |
+ // SSLClientSocket implementation. |
virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; |
virtual void GetSSLCertRequestInfo( |
SSLCertRequestInfo* cert_request_info) OVERRIDE; |
@@ -69,8 +69,9 @@ class SSLClientSocketNSS : public SSLClientSocket { |
unsigned int outlen) OVERRIDE; |
virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; |
- // StreamSocket methods: |
+ // StreamSocket implementation. |
virtual int Connect(OldCompletionCallback* callback) OVERRIDE; |
+ virtual int Connect(const CompletionCallback& callback) OVERRIDE; |
virtual void Disconnect() OVERRIDE; |
virtual bool IsConnected() const OVERRIDE; |
virtual bool IsConnectedAndIdle() const OVERRIDE; |
@@ -84,7 +85,7 @@ class SSLClientSocketNSS : public SSLClientSocket { |
virtual int64 NumBytesRead() const OVERRIDE; |
virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE; |
- // Socket methods: |
+ // Socket implementation. |
virtual int Read(IOBuffer* buf, |
int buf_len, |
OldCompletionCallback* callback) OVERRIDE; |
@@ -222,7 +223,8 @@ class SSLClientSocketNSS : public SSLClientSocket { |
HostPortPair host_and_port_; |
SSLConfig ssl_config_; |
- OldCompletionCallback* user_connect_callback_; |
+ OldCompletionCallback* old_user_connect_callback_; |
+ CompletionCallback user_connect_callback_; |
OldCompletionCallback* user_read_callback_; |
OldCompletionCallback* user_write_callback_; |