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/ssl_client_socket_pool.h | |
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/ssl_client_socket_pool.h')
-rw-r--r-- | net/socket/ssl_client_socket_pool.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index 6aff091..2c75e03 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_client_socket_pool.h @@ -24,6 +24,7 @@ namespace net { class ClientSocketFactory; class ConnectJobFactory; +class DnsRRResolver; class HttpProxyClientSocketPool; class HttpProxySocketParams; class SOCKSClientSocketPool; @@ -91,6 +92,7 @@ class SSLConnectJob : public ConnectJob { HttpProxyClientSocketPool* http_proxy_pool, ClientSocketFactory* client_socket_factory, HostResolver* host_resolver, + DnsRRResolver* dnsrr_resolver, Delegate* delegate, NetLog* net_log); virtual ~SSLConnectJob(); @@ -138,6 +140,7 @@ class SSLConnectJob : public ConnectJob { HttpProxyClientSocketPool* const http_proxy_pool_; ClientSocketFactory* const client_socket_factory_; HostResolver* const resolver_; + DnsRRResolver* dnsrr_resolver_; State next_state_; CompletionCallbackImpl<SSLConnectJob> callback_; @@ -162,6 +165,7 @@ class SSLClientSocketPool : public ClientSocketPool, int max_sockets_per_group, ClientSocketPoolHistograms* histograms, HostResolver* host_resolver, + DnsRRResolver* dnsrr_resolver, ClientSocketFactory* client_socket_factory, TCPClientSocketPool* tcp_pool, SOCKSClientSocketPool* socks_pool, @@ -228,6 +232,7 @@ class SSLClientSocketPool : public ClientSocketPool, HttpProxyClientSocketPool* http_proxy_pool, ClientSocketFactory* client_socket_factory, HostResolver* host_resolver, + DnsRRResolver* dnsrr_resolver, NetLog* net_log); virtual ~SSLConnectJobFactory() {} @@ -246,6 +251,7 @@ class SSLClientSocketPool : public ClientSocketPool, HttpProxyClientSocketPool* const http_proxy_pool_; ClientSocketFactory* const client_socket_factory_; HostResolver* const host_resolver_; + DnsRRResolver* dnsrr_resolver_; base::TimeDelta timeout_; NetLog* net_log_; |