Index: net/socket/ssl_client_socket_pool.h |
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h |
index efcce774338da61772f9d08fbd5dedb3a669824b..585401577521908ce0975372f492ca4236f5eb0f 100644 |
--- a/net/socket/ssl_client_socket_pool.h |
+++ b/net/socket/ssl_client_socket_pool.h |
@@ -197,9 +197,9 @@ class SSLConnectJob : public ConnectJob { |
virtual ~SSLConnectJob(); |
// 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 { |
@@ -242,7 +242,7 @@ class SSLConnectJob : public ConnectJob { |
// Starts the SSL connection process. 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; |
scoped_refptr<SSLSocketParams> params_; |
TransportClientSocketPool* const transport_pool_; |
@@ -302,51 +302,51 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool |
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; |
// Gets the SSLConnectJobMessenger for the given ssl session |cache_key|. If |
// none exits, it creates one and stores it in |messenger_map_|. |
@@ -363,7 +363,7 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool |
// When the user changes the SSL config, we flush all idle sockets so they |
// won't get re-used. |
- virtual void OnSSLConfigChanged() OVERRIDE; |
+ virtual void OnSSLConfigChanged() override; |
class SSLConnectJobFactory : public PoolBase::ConnectJobFactory { |
public: |
@@ -383,9 +383,9 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool |
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_; |