| 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 4463364645ff6f1030d27e53364405e7199e9c01..68aa718923de5387527725fa61b97f1c346063cf 100644
|
| --- a/jingle/notifier/base/proxy_resolving_client_socket.h
|
| +++ b/jingle/notifier/base/proxy_resolving_client_socket.h
|
| @@ -47,14 +47,11 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
|
|
|
| // net::StreamSocket implementation.
|
| virtual int Read(net::IOBuffer* buf, int buf_len,
|
| - net::OldCompletionCallback* callback) OVERRIDE;
|
| - virtual int Read(net::IOBuffer* buf, int buf_len,
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int Write(net::IOBuffer* buf, int buf_len,
|
| - net::OldCompletionCallback* callback) OVERRIDE;
|
| + const net::CompletionCallback& callback) OVERRIDE;
|
| 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;
|
| @@ -98,7 +95,6 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
|
| base::WeakPtrFactory<ProxyResolvingClientSocket> weak_factory_;
|
|
|
| // The callback passed to Connect().
|
| - net::OldCompletionCallback* old_user_connect_callback_;
|
| net::CompletionCallback user_connect_callback_;
|
| };
|
|
|
|
|