Index: net/http/http_proxy_client_socket_pool.h |
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h |
index 6b982dc51e6c0320e910af2bbc64dd90dd366916..8991224df97ec78b1ef4fd618814a7b05782276d 100644 |
--- a/net/http/http_proxy_client_socket_pool.h |
+++ b/net/http/http_proxy_client_socket_pool.h |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 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. |
@@ -170,9 +170,7 @@ class HttpProxyConnectJob : public ConnectJob { |
DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); |
}; |
-class NET_EXPORT_PRIVATE HttpProxyClientSocketPool |
- : public ClientSocketPool, |
- public LayeredPool { |
+class NET_EXPORT_PRIVATE HttpProxyClientSocketPool : public ClientSocketPool { |
public: |
HttpProxyClientSocketPool( |
int max_sockets, |
@@ -207,8 +205,6 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool |
virtual void Flush() OVERRIDE; |
- virtual bool IsStalled() const OVERRIDE; |
- |
virtual void CloseIdleSockets() OVERRIDE; |
virtual int IdleSocketCount() const OVERRIDE; |
@@ -220,10 +216,6 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool |
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, |
@@ -233,9 +225,6 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool |
virtual ClientSocketPoolHistograms* histograms() const OVERRIDE; |
- // LayeredPool implementation. |
- virtual bool CloseOneIdleConnection() OVERRIDE; |
- |
private: |
typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase; |