Index: net/socket/transport_client_socket_pool.h |
diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h |
index fce543263005160948ded6fa1a001b847e8c6602..14af726e94e2ea3e2baa7267baa3cc85c0fea080 100644 |
--- a/net/socket/transport_client_socket_pool.h |
+++ b/net/socket/transport_client_socket_pool.h |
@@ -167,7 +167,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob { |
virtual ~TransportConnectJob(); |
// ConnectJob methods. |
- virtual LoadState GetLoadState() const OVERRIDE; |
+ virtual LoadState GetLoadState() const override; |
// Rolls |addrlist| forward until the first IPv4 address, if any. |
// WARNING: this method should only be used to implement the prefer-IPv4 hack. |
@@ -194,7 +194,7 @@ class NET_EXPORT_PRIVATE TransportConnectJob : public ConnectJob { |
// Begins the host resolution and the TCP connect. Returns OK on success |
// and ERR_IO_PENDING if it cannot immediately service the request. |
// Otherwise, it returns a net error code. |
- virtual int ConnectInternal() OVERRIDE; |
+ virtual int ConnectInternal() override; |
TransportConnectJobHelper helper_; |
@@ -231,35 +231,35 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { |
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; |
- virtual void FlushWithError(int error) OVERRIDE; |
- virtual void CloseIdleSockets() OVERRIDE; |
- virtual int IdleSocketCount() const OVERRIDE; |
+ int id) override; |
+ virtual void FlushWithError(int error) override; |
+ virtual void CloseIdleSockets() 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; |
- virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; |
- virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
+ bool include_nested_pools) const override; |
+ virtual base::TimeDelta ConnectionTimeout() const override; |
+ virtual ClientSocketPoolHistograms* histograms() const override; |
// HigherLayeredPool implementation. |
- virtual bool IsStalled() const OVERRIDE; |
- virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; |
- virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; |
+ virtual bool IsStalled() const override; |
+ virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) override; |
+ virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) override; |
protected: |
// Methods shared with WebSocketTransportClientSocketPool |
@@ -287,9 +287,9 @@ class NET_EXPORT_PRIVATE TransportClientSocketPool : public ClientSocketPool { |
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: |
ClientSocketFactory* const client_socket_factory_; |