| Index: net/http/http_proxy_client_socket.h
|
| diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
|
| index 87eeda4b39b2fb7bccfa12ab497be5b8c3303de5..e4f83822afb990c1c71f326608e1ad1f408d0c16 100644
|
| --- a/net/http/http_proxy_client_socket.h
|
| +++ b/net/http/http_proxy_client_socket.h
|
| @@ -52,42 +52,41 @@ class HttpProxyClientSocket : public ProxyClientSocket {
|
| bool is_https_proxy);
|
|
|
| // On destruction Disconnect() is called.
|
| - virtual ~HttpProxyClientSocket();
|
| + ~HttpProxyClientSocket() override;
|
|
|
| // ProxyClientSocket implementation.
|
| - virtual const HttpResponseInfo* GetConnectResponseInfo() const override;
|
| - virtual HttpStream* CreateConnectResponseStream() override;
|
| - virtual int RestartWithAuth(const CompletionCallback& callback) override;
|
| - virtual const scoped_refptr<HttpAuthController>& GetAuthController() const
|
| - override;
|
| - virtual bool IsUsingSpdy() const override;
|
| - virtual NextProto GetProtocolNegotiated() const override;
|
| + const HttpResponseInfo* GetConnectResponseInfo() const override;
|
| + HttpStream* CreateConnectResponseStream() override;
|
| + int RestartWithAuth(const CompletionCallback& callback) override;
|
| + const scoped_refptr<HttpAuthController>& GetAuthController() const override;
|
| + bool IsUsingSpdy() const override;
|
| + NextProto GetProtocolNegotiated() const override;
|
|
|
| // StreamSocket implementation.
|
| - 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;
|
| + int Connect(const CompletionCallback& callback) override;
|
| + void Disconnect() override;
|
| + bool IsConnected() const override;
|
| + bool IsConnectedAndIdle() const override;
|
| + const BoundNetLog& NetLog() const override;
|
| + void SetSubresourceSpeculation() override;
|
| + void SetOmniboxSpeculation() override;
|
| + bool WasEverUsed() const override;
|
| + bool UsingTCPFastOpen() const override;
|
| + bool WasNpnNegotiated() const override;
|
| + NextProto GetNegotiatedProtocol() const override;
|
| + bool GetSSLInfo(SSLInfo* ssl_info) override;
|
|
|
| // Socket implementation.
|
| - virtual int Read(IOBuffer* buf,
|
| - int buf_len,
|
| - const CompletionCallback& callback) override;
|
| - virtual int Write(IOBuffer* buf,
|
| - int buf_len,
|
| - const CompletionCallback& callback) 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;
|
| + int Read(IOBuffer* buf,
|
| + int buf_len,
|
| + const CompletionCallback& callback) override;
|
| + int Write(IOBuffer* buf,
|
| + int buf_len,
|
| + const CompletionCallback& callback) override;
|
| + int SetReceiveBufferSize(int32 size) override;
|
| + int SetSendBufferSize(int32 size) override;
|
| + int GetPeerAddress(IPEndPoint* address) const override;
|
| + int GetLocalAddress(IPEndPoint* address) const override;
|
|
|
| private:
|
| enum State {
|
|
|