| Index: net/http/http_network_session.cc
|
| diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
|
| index a9574362dac729180548331c5c766184a1dee586..ffdaee52d72660dbe1e60efba4650fa91b8c2ac7 100644
|
| --- a/net/http/http_network_session.cc
|
| +++ b/net/http/http_network_session.cc
|
| @@ -17,6 +17,7 @@
|
| #include "net/http/url_security_manager.h"
|
| #include "net/proxy/proxy_service.h"
|
| #include "net/socket/client_socket_factory.h"
|
| +#include "net/socket/client_socket_pool_manager_impl.h"
|
| #include "net/spdy/spdy_session_pool.h"
|
|
|
| namespace net {
|
| @@ -30,18 +31,20 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
|
| http_auth_handler_factory_(params.http_auth_handler_factory),
|
| proxy_service_(params.proxy_service),
|
| ssl_config_service_(params.ssl_config_service),
|
| - socket_pool_manager_(params.net_log,
|
| - params.client_socket_factory ?
|
| - params.client_socket_factory :
|
| - ClientSocketFactory::GetDefaultFactory(),
|
| - params.host_resolver,
|
| - params.cert_verifier,
|
| - params.origin_bound_cert_service,
|
| - params.dnsrr_resolver,
|
| - params.dns_cert_checker,
|
| - params.ssl_host_info_factory,
|
| - params.proxy_service,
|
| - params.ssl_config_service),
|
| + socket_pool_manager_(
|
| + new ClientSocketPoolManagerImpl(
|
| + params.net_log,
|
| + params.client_socket_factory ?
|
| + params.client_socket_factory :
|
| + ClientSocketFactory::GetDefaultFactory(),
|
| + params.host_resolver,
|
| + params.cert_verifier,
|
| + params.origin_bound_cert_service,
|
| + params.dnsrr_resolver,
|
| + params.dns_cert_checker,
|
| + params.ssl_host_info_factory,
|
| + params.proxy_service,
|
| + params.ssl_config_service)),
|
| spdy_session_pool_(params.host_resolver,
|
| params.ssl_config_service,
|
| params.http_server_properties),
|
| @@ -70,21 +73,21 @@ void HttpNetworkSession::RemoveResponseDrainer(
|
|
|
| SOCKSClientSocketPool* HttpNetworkSession::GetSocketPoolForSOCKSProxy(
|
| const HostPortPair& socks_proxy) {
|
| - return socket_pool_manager_.GetSocketPoolForSOCKSProxy(socks_proxy);
|
| + return socket_pool_manager_->GetSocketPoolForSOCKSProxy(socks_proxy);
|
| }
|
|
|
| HttpProxyClientSocketPool* HttpNetworkSession::GetSocketPoolForHTTPProxy(
|
| const HostPortPair& http_proxy) {
|
| - return socket_pool_manager_.GetSocketPoolForHTTPProxy(http_proxy);
|
| + return socket_pool_manager_->GetSocketPoolForHTTPProxy(http_proxy);
|
| }
|
|
|
| SSLClientSocketPool* HttpNetworkSession::GetSocketPoolForSSLWithProxy(
|
| const HostPortPair& proxy_server) {
|
| - return socket_pool_manager_.GetSocketPoolForSSLWithProxy(proxy_server);
|
| + return socket_pool_manager_->GetSocketPoolForSSLWithProxy(proxy_server);
|
| }
|
|
|
| Value* HttpNetworkSession::SocketPoolInfoToValue() const {
|
| - return socket_pool_manager_.SocketPoolInfoToValue();
|
| + return socket_pool_manager_->SocketPoolInfoToValue();
|
| }
|
|
|
| Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const {
|
| @@ -92,12 +95,12 @@ Value* HttpNetworkSession::SpdySessionPoolInfoToValue() const {
|
| }
|
|
|
| void HttpNetworkSession::CloseAllConnections() {
|
| - socket_pool_manager_.FlushSocketPools();
|
| + socket_pool_manager_->FlushSocketPools();
|
| spdy_session_pool_.CloseCurrentSessions();
|
| }
|
|
|
| void HttpNetworkSession::CloseIdleConnections() {
|
| - socket_pool_manager_.CloseIdleSockets();
|
| + socket_pool_manager_->CloseIdleSockets();
|
| spdy_session_pool_.CloseIdleSessions();
|
| }
|
|
|
|
|