Index: net/http/http_proxy_client_socket_pool.cc |
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc |
index c9831c38100650a09c76480a6d43d6d2faaa5751..81943765e3f0c567b6fc7e53242d5a81e0855e54 100644 |
--- a/net/http/http_proxy_client_socket_pool.cc |
+++ b/net/http/http_proxy_client_socket_pool.cc |
@@ -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. |
@@ -391,21 +391,9 @@ HttpProxyClientSocketPool::HttpProxyClientSocketPool( |
new HttpProxyConnectJobFactory(transport_pool, |
ssl_pool, |
host_resolver, |
- net_log)) { |
- // We should always have a |transport_pool_| except in unit tests. |
- if (transport_pool_) |
- transport_pool_->AddLayeredPool(this); |
- if (ssl_pool_) |
- ssl_pool_->AddLayeredPool(this); |
-} |
+ net_log)) {} |
-HttpProxyClientSocketPool::~HttpProxyClientSocketPool() { |
- if (ssl_pool_) |
- ssl_pool_->RemoveLayeredPool(this); |
- // We should always have a |transport_pool_| except in unit tests. |
- if (transport_pool_) |
- transport_pool_->RemoveLayeredPool(this); |
-} |
+HttpProxyClientSocketPool::~HttpProxyClientSocketPool() {} |
int HttpProxyClientSocketPool::RequestSocket( |
const std::string& group_name, const void* socket_params, |
@@ -444,12 +432,6 @@ void HttpProxyClientSocketPool::Flush() { |
base_.Flush(); |
} |
-bool HttpProxyClientSocketPool::IsStalled() const { |
- return base_.IsStalled() || |
- (transport_pool_ && transport_pool_->IsStalled()) || |
- (ssl_pool_ && ssl_pool_->IsStalled()); |
-} |
- |
void HttpProxyClientSocketPool::CloseIdleSockets() { |
base_.CloseIdleSockets(); |
} |
@@ -468,14 +450,6 @@ LoadState HttpProxyClientSocketPool::GetLoadState( |
return base_.GetLoadState(group_name, handle); |
} |
-void HttpProxyClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) { |
- base_.AddLayeredPool(layered_pool); |
-} |
- |
-void HttpProxyClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) { |
- base_.RemoveLayeredPool(layered_pool); |
-} |
- |
DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue( |
const std::string& name, |
const std::string& type, |
@@ -506,10 +480,4 @@ ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const { |
return base_.histograms(); |
} |
-bool HttpProxyClientSocketPool::CloseOneIdleConnection() { |
- if (base_.CloseOneIdleSocket()) |
- return true; |
- return base_.CloseOneIdleConnectionInLayeredPool(); |
-} |
- |
} // namespace net |