| Index: net/http/http_proxy_client_socket_pool.h
|
| diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
|
| index 9dac0901899a58e3baddff5ac3801a21bd6b622c..988191b18ab6852fa173f734e8fa0b322ba1d112 100644
|
| --- a/net/http/http_proxy_client_socket_pool.h
|
| +++ b/net/http/http_proxy_client_socket_pool.h
|
| @@ -111,12 +111,12 @@ class HttpProxyConnectJob : public ConnectJob {
|
| HostResolver* host_resolver,
|
| Delegate* delegate,
|
| NetLog* net_log);
|
| - virtual ~HttpProxyConnectJob();
|
| + ~HttpProxyConnectJob() override;
|
|
|
| // ConnectJob methods.
|
| - virtual LoadState GetLoadState() const override;
|
| + LoadState GetLoadState() const override;
|
|
|
| - virtual void GetAdditionalErrorState(ClientSocketHandle* handle) override;
|
| + void GetAdditionalErrorState(ClientSocketHandle* handle) override;
|
|
|
| private:
|
| enum State {
|
| @@ -157,7 +157,7 @@ class HttpProxyConnectJob : public ConnectJob {
|
| // that the tunnel needs authentication credentials, the socket will be
|
| // returned in this case, and must be release back to the pool; or
|
| // a standard net error code will be returned.
|
| - virtual int ConnectInternal() override;
|
| + int ConnectInternal() override;
|
|
|
| scoped_refptr<HttpProxySocketParams> params_;
|
| TransportClientSocketPool* const transport_pool_;
|
| @@ -197,59 +197,57 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
| const ProxyDelegate* proxy_delegate,
|
| NetLog* net_log);
|
|
|
| - virtual ~HttpProxyClientSocketPool();
|
| + ~HttpProxyClientSocketPool() override;
|
|
|
| // ClientSocketPool implementation.
|
| - virtual int RequestSocket(const std::string& group_name,
|
| - const void* connect_params,
|
| - RequestPriority priority,
|
| - ClientSocketHandle* handle,
|
| - const CompletionCallback& callback,
|
| - const BoundNetLog& net_log) override;
|
| + int RequestSocket(const std::string& group_name,
|
| + const void* connect_params,
|
| + RequestPriority priority,
|
| + ClientSocketHandle* handle,
|
| + const CompletionCallback& callback,
|
| + const BoundNetLog& net_log) override;
|
|
|
| - virtual void RequestSockets(const std::string& group_name,
|
| - const void* params,
|
| - int num_sockets,
|
| - const BoundNetLog& net_log) override;
|
| + void RequestSockets(const std::string& group_name,
|
| + const void* params,
|
| + int num_sockets,
|
| + const BoundNetLog& net_log) override;
|
|
|
| - virtual void CancelRequest(const std::string& group_name,
|
| - ClientSocketHandle* handle) override;
|
| + void CancelRequest(const std::string& group_name,
|
| + ClientSocketHandle* handle) override;
|
|
|
| - virtual void ReleaseSocket(const std::string& group_name,
|
| - scoped_ptr<StreamSocket> socket,
|
| - int id) override;
|
| + void ReleaseSocket(const std::string& group_name,
|
| + scoped_ptr<StreamSocket> socket,
|
| + int id) override;
|
|
|
| - virtual void FlushWithError(int error) override;
|
| + void FlushWithError(int error) override;
|
|
|
| - virtual void CloseIdleSockets() override;
|
| + void CloseIdleSockets() override;
|
|
|
| - virtual int IdleSocketCount() const override;
|
| + int IdleSocketCount() const override;
|
|
|
| - virtual int IdleSocketCountInGroup(
|
| - const std::string& group_name) const override;
|
| + int IdleSocketCountInGroup(const std::string& group_name) const override;
|
|
|
| - virtual LoadState GetLoadState(
|
| - const std::string& group_name,
|
| - const ClientSocketHandle* handle) const override;
|
| + LoadState GetLoadState(const std::string& group_name,
|
| + const ClientSocketHandle* handle) const override;
|
|
|
| - virtual base::DictionaryValue* GetInfoAsValue(
|
| + base::DictionaryValue* GetInfoAsValue(
|
| const std::string& name,
|
| const std::string& type,
|
| bool include_nested_pools) const override;
|
|
|
| - virtual base::TimeDelta ConnectionTimeout() const override;
|
| + base::TimeDelta ConnectionTimeout() const override;
|
|
|
| - virtual ClientSocketPoolHistograms* histograms() const override;
|
| + ClientSocketPoolHistograms* histograms() const override;
|
|
|
| // LowerLayeredPool implementation.
|
| - virtual bool IsStalled() const override;
|
| + bool IsStalled() const override;
|
|
|
| - virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override;
|
| + void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override;
|
|
|
| - virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override;
|
| + void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override;
|
|
|
| // HigherLayeredPool implementation.
|
| - virtual bool CloseOneIdleConnection() override;
|
| + bool CloseOneIdleConnection() override;
|
|
|
| private:
|
| typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase;
|
| @@ -264,12 +262,12 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
|
| NetLog* net_log);
|
|
|
| // ClientSocketPoolBase::ConnectJobFactory methods.
|
| - virtual scoped_ptr<ConnectJob> NewConnectJob(
|
| + scoped_ptr<ConnectJob> NewConnectJob(
|
| const std::string& group_name,
|
| const PoolBase::Request& request,
|
| ConnectJob::Delegate* delegate) const override;
|
|
|
| - virtual base::TimeDelta ConnectionTimeout() const override;
|
| + base::TimeDelta ConnectionTimeout() const override;
|
|
|
| private:
|
| TransportClientSocketPool* const transport_pool_;
|
|
|