net/socket/client_socket_pool_manager.cc - Issue 3533013: net: plumb DnsRRResolver from IOThread to HttpNetworkSession.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/client_socket_pool_manager.cc

Issue 3533013: net: plumb DnsRRResolver from IOThread to HttpNetworkSession. (Closed)

Patch Set: Created 10 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/service/net/service_url_request_context.cc ('K') | « net/socket/client_socket_pool_manager.h ('k') | net/socket/socket_test_util.cc » ('j') | net/socket/ssl_client_socket_pool.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/socket/client_socket_pool_manager.cc

diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc

index 423f8b21d0dcc372298547c393b022ad44eb16aa..264cdf8128ff0769cbca81280df89f2dbf4372ea 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),

« chrome/service/net/service_url_request_context.cc ('K') | « net/socket/client_socket_pool_manager.h ('k') | net/socket/socket_test_util.cc » ('j') | net/socket/ssl_client_socket_pool.cc » ('J')