diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 15:18:58 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 15:18:58 +0000 |
| commit | 51c07140c9533c09f348d9fc7dfe5aea6341e618 (patch) | |
| tree | df239e1fb59cc734a2010ea2d0b34bcf371646e6 /net/socket/client_socket_pool_manager.cc | |
| parent | b6207ced7803f1aa72ca31c02705d148ef718cd8 (diff) | |
| download | chromium_src-51c07140c9533c09f348d9fc7dfe5aea6341e618.zip chromium_src-51c07140c9533c09f348d9fc7dfe5aea6341e618.tar.gz chromium_src-51c07140c9533c09f348d9fc7dfe5aea6341e618.tar.bz2 | |
net: plumb DnsRRResolver from IOThread to HttpNetworkSession.
This patch gets us most of the way. The next patch finishes plumbing
into the SSL client socket pool.
BUG=none
TEST=none
http://codereview.chromium.org/3533013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_manager.cc')
| -rw-r--r-- | net/socket/client_socket_pool_manager.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc index 423f8b2..264cdf8 100644 --- a/net/socket/client_socket_pool_manager.cc +++ b/net/socket/client_socket_pool_manager.cc @@ -56,11 +56,13 @@ ClientSocketPoolManager::ClientSocketPoolManager( NetLog* net_log, ClientSocketFactory* socket_factory, HostResolver* host_resolver, + DnsRRResolver* dnsrr_resolver, ProxyService* proxy_service, SSLConfigService* ssl_config_service) : net_log_(net_log), socket_factory_(socket_factory), host_resolver_(host_resolver), + dnsrr_resolver_(dnsrr_resolver), proxy_service_(proxy_service), ssl_config_service_(ssl_config_service), tcp_pool_histograms_("TCP"), @@ -75,6 +77,7 @@ ClientSocketPoolManager::ClientSocketPoolManager( g_max_sockets, g_max_sockets_per_group, &ssl_pool_histograms_, host_resolver, + dnsrr_resolver, socket_factory, tcp_socket_pool_.get(), NULL /* no socks proxy */, @@ -222,6 +225,7 @@ HttpProxyClientSocketPool* ClientSocketPoolManager::GetSocketPoolForHTTPProxy( g_max_sockets_per_proxy_server, g_max_sockets_per_group, &ssl_for_https_proxy_pool_histograms_, host_resolver_, + dnsrr_resolver_, socket_factory_, tcp_https_ret.first->second /* https proxy */, NULL /* no socks proxy */, @@ -255,6 +259,7 @@ SSLClientSocketPool* ClientSocketPoolManager::GetSocketPoolForSSLWithProxy( g_max_sockets_per_proxy_server, g_max_sockets_per_group, &ssl_pool_histograms_, host_resolver_, + dnsrr_resolver_, socket_factory_, NULL, /* no tcp pool, we always go through a proxy */ GetSocketPoolForSOCKSProxy(proxy_server), |