Index: net/socket/ssl_client_socket_pool.h |
=================================================================== |
--- net/socket/ssl_client_socket_pool.h (revision 211652) |
+++ net/socket/ssl_client_socket_pool.h (working copy) |
@@ -160,7 +160,7 @@ |
class NET_EXPORT_PRIVATE SSLClientSocketPool |
: public ClientSocketPool, |
- public LayeredPool, |
+ public HigherLayeredPool, |
public SSLConfigService::Observer { |
public: |
// Only the pools that will be used are required. i.e. if you never |
@@ -205,8 +205,6 @@ |
virtual void FlushWithError(int error) OVERRIDE; |
- virtual bool IsStalled() const OVERRIDE; |
- |
virtual void CloseIdleSockets() OVERRIDE; |
virtual int IdleSocketCount() const OVERRIDE; |
@@ -218,10 +216,6 @@ |
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, |
@@ -231,7 +225,14 @@ |
virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
- // LayeredPool implementation. |
+ // LowerLayeredPool implementation. |
+ virtual bool IsStalled() const OVERRIDE; |
+ |
+ virtual void AddHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; |
+ |
+ virtual void RemoveHigherLayeredPool(HigherLayeredPool* higher_pool) OVERRIDE; |
+ |
+ // HigherLayeredPool implementation. |
virtual bool CloseOneIdleConnection() OVERRIDE; |
private: |