| Index: net/socket/socks_client_socket.h
|
| diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
|
| index eb74a5e3386ee7f93144e64cdcd0207ac622ba75..c7089af9d19de114df73285d614f2b8718a98ac4 100644
|
| --- a/net/socket/socks_client_socket.h
|
| +++ b/net/socket/socks_client_socket.h
|
| @@ -49,6 +49,7 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
|
|
|
| // Does the SOCKS handshake and completes the protocol.
|
| virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
|
| + virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
|
| virtual void Disconnect() OVERRIDE;
|
| virtual bool IsConnected() const OVERRIDE;
|
| virtual bool IsConnectedAndIdle() const OVERRIDE;
|
| @@ -110,7 +111,8 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
|
| State next_state_;
|
|
|
| // Stores the callback to the layer above, called on completing Connect().
|
| - OldCompletionCallback* user_callback_;
|
| + OldCompletionCallback* old_user_callback_;
|
| + CompletionCallback user_callback_;
|
|
|
| // This IOBuffer is used by the class to read and write
|
| // SOCKS handshake data. The length contains the expected size to
|
|
|