| Index: net/socket/socks_client_socket.h
|
| diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
|
| index a7aff1cb7e20c8d0c0644001246422267a78c7fc..95d4da16742c88501ef8dffde50afebe53c2022f 100644
|
| --- a/net/socket/socks_client_socket.h
|
| +++ b/net/socket/socks_client_socket.h
|
| @@ -49,27 +49,31 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
|
| // StreamSocket methods:
|
|
|
| // Does the SOCKS handshake and completes the protocol.
|
| - virtual int Connect(OldCompletionCallback* callback);
|
| - virtual void Disconnect();
|
| - virtual bool IsConnected() const;
|
| - virtual bool IsConnectedAndIdle() const;
|
| - virtual const BoundNetLog& NetLog() const;
|
| - virtual void SetSubresourceSpeculation();
|
| - virtual void SetOmniboxSpeculation();
|
| - virtual bool WasEverUsed() const;
|
| - virtual bool UsingTCPFastOpen() const;
|
| - virtual int64 NumBytesRead() const;
|
| - virtual base::TimeDelta GetConnectTimeMicros() const;
|
| + virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
|
| + virtual void Disconnect() OVERRIDE;
|
| + virtual bool IsConnected() const OVERRIDE;
|
| + virtual bool IsConnectedAndIdle() const OVERRIDE;
|
| + virtual const BoundNetLog& NetLog() const OVERRIDE;
|
| + virtual void SetSubresourceSpeculation() OVERRIDE;
|
| + virtual void SetOmniboxSpeculation() OVERRIDE;
|
| + virtual bool WasEverUsed() const OVERRIDE;
|
| + virtual bool UsingTCPFastOpen() const OVERRIDE;
|
| + virtual int64 NumBytesRead() const OVERRIDE;
|
| + virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
|
|
|
| // Socket methods:
|
| - virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| - virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| -
|
| - virtual bool SetReceiveBufferSize(int32 size);
|
| - virtual bool SetSendBufferSize(int32 size);
|
| -
|
| - virtual int GetPeerAddress(AddressList* address) const;
|
| - virtual int GetLocalAddress(IPEndPoint* address) const;
|
| + virtual int Read(IOBuffer* buf,
|
| + int buf_len,
|
| + OldCompletionCallback* callback) OVERRIDE;
|
| + virtual int Write(IOBuffer* buf,
|
| + int buf_len,
|
| + OldCompletionCallback* callback) OVERRIDE;
|
| +
|
| + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| + virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
| +
|
| + virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
|
| + virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, CompleteHandshake);
|
|
|