| Index: jingle/notifier/base/proxy_resolving_client_socket.h
|
| diff --git a/jingle/notifier/base/proxy_resolving_client_socket.h b/jingle/notifier/base/proxy_resolving_client_socket.h
|
| index 0c40a222be5b2cce9ca08ad0ecc1d0a056c32558..0f27bc1d60e5306ec7425e43811f4aabd3d59edf 100644
|
| --- a/jingle/notifier/base/proxy_resolving_client_socket.h
|
| +++ b/jingle/notifier/base/proxy_resolving_client_socket.h
|
| @@ -53,6 +53,7 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
|
| virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
| virtual int Connect(net::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;
|
| @@ -95,7 +96,8 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
|
| base::WeakPtrFactory<ProxyResolvingClientSocket> weak_factory_;
|
|
|
| // The callback passed to Connect().
|
| - net::OldCompletionCallback* user_connect_callback_;
|
| + net::OldCompletionCallback* old_user_connect_callback_;
|
| + net::CompletionCallback user_connect_callback_;
|
| };
|
|
|
| } // namespace notifier
|
|
|