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 e29bea57fd4060961c1ad2ee4a12508d5c6c03b9..b851c967f553297c9c4d3dad937fcee57619d671 100644 |
--- a/net/socket/ssl_client_socket_pool.h |
+++ b/net/socket/ssl_client_socket_pool.h |
@@ -168,6 +168,7 @@ class SSLConnectJob : public ConnectJob { |
class NET_EXPORT_PRIVATE SSLClientSocketPool |
: public ClientSocketPool, |
+ public LayeredPool, |
public SSLConfigService::Observer { |
public: |
// Only the pools that will be used are required. i.e. if you never |
@@ -197,39 +198,50 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool |
RequestPriority priority, |
ClientSocketHandle* handle, |
OldCompletionCallback* callback, |
- const BoundNetLog& net_log); |
+ const BoundNetLog& net_log) OVERRIDE; |
virtual void RequestSockets(const std::string& group_name, |
const void* params, |
int num_sockets, |
- const BoundNetLog& net_log); |
+ const BoundNetLog& net_log) OVERRIDE; |
virtual void CancelRequest(const std::string& group_name, |
- ClientSocketHandle* handle); |
+ ClientSocketHandle* handle) OVERRIDE; |
virtual void ReleaseSocket(const std::string& group_name, |
StreamSocket* socket, |
- int id); |
+ int id) OVERRIDE; |
- virtual void Flush(); |
+ virtual void Flush() OVERRIDE; |
- virtual void CloseIdleSockets(); |
+ virtual bool IsStalled() const OVERRIDE; |
- virtual int IdleSocketCount() const; |
+ virtual void CloseIdleSockets() OVERRIDE; |
- virtual int IdleSocketCountInGroup(const std::string& group_name) const; |
+ virtual int IdleSocketCount() const OVERRIDE; |
- virtual LoadState GetLoadState(const std::string& group_name, |
- const ClientSocketHandle* handle) const; |
+ virtual int IdleSocketCountInGroup( |
+ const std::string& group_name) const OVERRIDE; |
+ |
+ virtual LoadState GetLoadState( |
+ const std::string& group_name, |
+ const ClientSocketHandle* handle) const OVERRIDE; |
+ |
+ virtual void AddLayeredPool(LayeredPool* layered_pool) OVERRIDE; |
+ |
+ virtual void RemoveLayeredPool(LayeredPool* layered_pool) OVERRIDE; |
virtual base::DictionaryValue* GetInfoAsValue( |
const std::string& name, |
const std::string& type, |
- bool include_nested_pools) const; |
+ bool include_nested_pools) const OVERRIDE; |
+ |
+ virtual base::TimeDelta ConnectionTimeout() const OVERRIDE; |
- virtual base::TimeDelta ConnectionTimeout() const; |
+ virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
- virtual ClientSocketPoolHistograms* histograms() const; |
+ // LayeredPool methods: |
+ virtual bool CloseOneIdleConnection() OVERRIDE; |
private: |
typedef ClientSocketPoolBase<SSLSocketParams> PoolBase; |