Index: net/socket/socks_client_socket_pool.h |
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h |
index 3fc7df6831935279b665efafac4bfd0eba5a2ce0..92820263c50c6bbf10e98830ae0e5aa89e5aafcb 100644 |
--- a/net/socket/socks_client_socket_pool.h |
+++ b/net/socket/socks_client_socket_pool.h |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -105,7 +105,8 @@ class SOCKSConnectJob : public ConnectJob { |
DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob); |
}; |
-class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool { |
+class NET_EXPORT_PRIVATE SOCKSClientSocketPool |
+ : public ClientSocketPool, public LayeredPool { |
public: |
SOCKSClientSocketPool( |
int max_sockets, |
@@ -139,6 +140,8 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool { |
virtual void Flush() OVERRIDE; |
+ virtual bool IsStalled() const OVERRIDE; |
+ |
virtual void CloseIdleSockets() OVERRIDE; |
virtual int IdleSocketCount() const OVERRIDE; |
@@ -150,6 +153,10 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool { |
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, |
@@ -159,6 +166,9 @@ class NET_EXPORT_PRIVATE SOCKSClientSocketPool : public ClientSocketPool { |
virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
+ // LayeredPool implementation. |
+ virtual bool CloseOneIdleConnection() OVERRIDE; |
+ |
private: |
typedef ClientSocketPoolBase<SOCKSSocketParams> PoolBase; |