| Index: net/spdy/spdy_proxy_client_socket.h
|
| diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
|
| index fb2d9a33f6b9bc7e29bf91c44363c033c6628107..9c210b2732ebc93646daa479c9115d2748e22f51 100644
|
| --- a/net/spdy/spdy_proxy_client_socket.h
|
| +++ b/net/spdy/spdy_proxy_client_socket.h
|
| @@ -61,7 +61,6 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
|
| virtual const scoped_refptr<HttpAuthController>& auth_controller() OVERRIDE;
|
|
|
| // StreamSocket implementation.
|
| - virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
|
| virtual int Connect(const CompletionCallback& callback) OVERRIDE;
|
| virtual void Disconnect() OVERRIDE;
|
| virtual bool IsConnected() const OVERRIDE;
|
| @@ -77,13 +76,10 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
|
| // Socket implementation.
|
| virtual int Read(IOBuffer* buf,
|
| int buf_len,
|
| - OldCompletionCallback* callback) OVERRIDE;
|
| - virtual int Read(IOBuffer* buf,
|
| - int buf_len,
|
| const CompletionCallback& callback) OVERRIDE;
|
| virtual int Write(IOBuffer* buf,
|
| int buf_len,
|
| - OldCompletionCallback* callback) OVERRIDE;
|
| + const CompletionCallback& callback) OVERRIDE;
|
| virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
| virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
|
| @@ -134,10 +130,9 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
|
|
|
| // Stores the callback to the layer above, called on completing Read() or
|
| // Connect().
|
| - OldCompletionCallback* old_read_callback_;
|
| CompletionCallback read_callback_;
|
| // Stores the callback to the layer above, called on completing Write().
|
| - OldCompletionCallback* write_callback_;
|
| + CompletionCallback write_callback_;
|
|
|
| // CONNECT request and response.
|
| HttpRequestInfo request_;
|
|
|