| Index: net/socket/socks_client_socket.h
|
| diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
|
| index 26da332b3ea2da7ebdc0fe5bdb98088b7048575b..d480de40da73229922e5d31f139c10bc3dd6145c 100644
|
| --- a/net/socket/socks_client_socket.h
|
| +++ b/net/socket/socks_client_socket.h
|
| @@ -40,32 +40,32 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public StreamSocket {
|
| // StreamSocket implementation.
|
|
|
| // Does the SOCKS handshake and completes the protocol.
|
| - virtual int Connect(const CompletionCallback& 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 bool WasNpnNegotiated() const OVERRIDE;
|
| - virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
|
| - virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
|
| + virtual int Connect(const CompletionCallback& 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 bool WasNpnNegotiated() const override;
|
| + virtual NextProto GetNegotiatedProtocol() const override;
|
| + virtual bool GetSSLInfo(SSLInfo* ssl_info) override;
|
|
|
| // Socket implementation.
|
| virtual int Read(IOBuffer* buf,
|
| int buf_len,
|
| - const CompletionCallback& callback) OVERRIDE;
|
| + const CompletionCallback& callback) override;
|
| virtual int Write(IOBuffer* buf,
|
| int buf_len,
|
| - const CompletionCallback& callback) OVERRIDE;
|
| + const CompletionCallback& callback) override;
|
|
|
| - virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
|
| - virtual int SetSendBufferSize(int32 size) OVERRIDE;
|
| + virtual int SetReceiveBufferSize(int32 size) override;
|
| + virtual int SetSendBufferSize(int32 size) override;
|
|
|
| - virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
|
| - virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
|
| + virtual int GetPeerAddress(IPEndPoint* address) const override;
|
| + virtual int GetLocalAddress(IPEndPoint* address) const override;
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, CompleteHandshake);
|
|
|