| 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 585401577521908ce0975372f492ca4236f5eb0f..c7f613e5149f2503ad8e64543b361552ab179003 100644
|
| --- a/net/socket/ssl_client_socket_pool.h
|
| +++ b/net/socket/ssl_client_socket_pool.h
|
| @@ -194,12 +194,12 @@ class SSLConnectJob : public ConnectJob {
|
| const GetMessengerCallback& get_messenger_callback,
|
| Delegate* delegate,
|
| NetLog* net_log);
|
| - virtual ~SSLConnectJob();
|
| + ~SSLConnectJob() 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 {
|
| @@ -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;
|
| + int ConnectInternal() override;
|
|
|
| scoped_refptr<SSLSocketParams> params_;
|
| TransportClientSocketPool* const transport_pool_;
|
| @@ -294,59 +294,57 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
|
| bool enable_ssl_connect_job_waiting,
|
| NetLog* net_log);
|
|
|
| - virtual ~SSLClientSocketPool();
|
| + ~SSLClientSocketPool() 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;
|
|
|
| // Gets the SSLConnectJobMessenger for the given ssl session |cache_key|. If
|
| // none exits, it creates one and stores it in |messenger_map_|.
|
| @@ -363,7 +361,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;
|
| + void OnSSLConfigChanged() override;
|
|
|
| class SSLConnectJobFactory : public PoolBase::ConnectJobFactory {
|
| public:
|
| @@ -377,15 +375,15 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
|
| const SSLConnectJob::GetMessengerCallback& get_messenger_callback,
|
| NetLog* net_log);
|
|
|
| - virtual ~SSLConnectJobFactory();
|
| + ~SSLConnectJobFactory() override;
|
|
|
| // 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_;
|
|
|