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 7ce0f37f51002b563b2e8a5010e6221a785a35fe..9dac0901899a58e3baddff5ac3801a21bd6b622c 100644 |
--- a/net/http/http_proxy_client_socket_pool.h |
+++ b/net/http/http_proxy_client_socket_pool.h |
@@ -114,9 +114,9 @@ class HttpProxyConnectJob : public ConnectJob { |
virtual ~HttpProxyConnectJob(); |
// ConnectJob methods. |
- virtual LoadState GetLoadState() const OVERRIDE; |
+ virtual LoadState GetLoadState() const override; |
- virtual void GetAdditionalErrorState(ClientSocketHandle* handle) OVERRIDE; |
+ virtual 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; |
+ virtual int ConnectInternal() override; |
scoped_refptr<HttpProxySocketParams> params_; |
TransportClientSocketPool* const transport_pool_; |
@@ -205,51 +205,51 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool |
RequestPriority priority, |
ClientSocketHandle* handle, |
const CompletionCallback& callback, |
- const BoundNetLog& net_log) OVERRIDE; |
+ const BoundNetLog& net_log) override; |
virtual void RequestSockets(const std::string& group_name, |
const void* params, |
int num_sockets, |
- const BoundNetLog& net_log) OVERRIDE; |
+ const BoundNetLog& net_log) override; |
virtual void CancelRequest(const std::string& group_name, |
- ClientSocketHandle* handle) OVERRIDE; |
+ ClientSocketHandle* handle) override; |
virtual void ReleaseSocket(const std::string& group_name, |
scoped_ptr<StreamSocket> socket, |
- int id) OVERRIDE; |
+ int id) override; |
- virtual void FlushWithError(int error) OVERRIDE; |
+ virtual void FlushWithError(int error) override; |
- virtual void CloseIdleSockets() OVERRIDE; |
+ virtual void CloseIdleSockets() override; |
- virtual int IdleSocketCount() const OVERRIDE; |
+ virtual int IdleSocketCount() const override; |
virtual int IdleSocketCountInGroup( |
- const std::string& group_name) const OVERRIDE; |
+ const std::string& group_name) const override; |
virtual LoadState GetLoadState( |
const std::string& group_name, |
- const ClientSocketHandle* handle) const OVERRIDE; |
+ const ClientSocketHandle* handle) const override; |
virtual base::DictionaryValue* GetInfoAsValue( |
const std::string& name, |
const std::string& type, |
- bool include_nested_pools) const OVERRIDE; |
+ bool include_nested_pools) const override; |
- virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; |
+ virtual base::TimeDelta ConnectionTimeout() const override; |
- virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
+ virtual ClientSocketPoolHistograms* histograms() const override; |
// LowerLayeredPool implementation. |
- virtual bool IsStalled() const OVERRIDE; |
+ virtual bool IsStalled() const override; |
- virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; |
+ virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; |
- virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; |
+ virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; |
// HigherLayeredPool implementation. |
- virtual bool CloseOneIdleConnection() OVERRIDE; |
+ virtual bool CloseOneIdleConnection() override; |
private: |
typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase; |
@@ -267,9 +267,9 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool |
virtual scoped_ptr<ConnectJob> NewConnectJob( |
const std::string& group_name, |
const PoolBase::Request& request, |
- ConnectJob::Delegate* delegate) const OVERRIDE; |
+ ConnectJob::Delegate* delegate) const override; |
- virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; |
+ virtual base::TimeDelta ConnectionTimeout() const override; |
private: |
TransportClientSocketPool* const transport_pool_; |