| Index: net/http/http_proxy_client_socket_pool.cc
|
| ===================================================================
|
| --- net/http/http_proxy_client_socket_pool.cc (revision 112133)
|
| +++ net/http/http_proxy_client_socket_pool.cc (working copy)
|
| @@ -391,21 +391,9 @@
|
| 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,
|
| @@ -446,12 +434,6 @@
|
| base_.Flush();
|
| }
|
|
|
| -bool HttpProxyClientSocketPool::IsStalled() const {
|
| - return base_.IsStalled() ||
|
| - (transport_pool_ && transport_pool_->IsStalled()) ||
|
| - (ssl_pool_ && ssl_pool_->IsStalled());
|
| -}
|
| -
|
| void HttpProxyClientSocketPool::CloseIdleSockets() {
|
| base_.CloseIdleSockets();
|
| }
|
| @@ -470,14 +452,6 @@
|
| 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,
|
| @@ -508,10 +482,4 @@
|
| return base_.histograms();
|
| }
|
|
|
| -bool HttpProxyClientSocketPool::CloseOneIdleConnection() {
|
| - if (base_.CloseOneIdleSocket())
|
| - return true;
|
| - return base_.CloseOneIdleConnectionInLayeredPool();
|
| -}
|
| -
|
| } // namespace net
|
|
|