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/url_request | |
| 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/url_request')
| -rw-r--r-- | net/url_request/url_request_context.cc | 1 | ||||
| -rw-r--r-- | net/url_request/url_request_context.h | 6 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc index 0ea8477..329f83f 100644 --- a/net/url_request/url_request_context.cc +++ b/net/url_request/url_request_context.cc @@ -10,6 +10,7 @@ URLRequestContext::URLRequestContext() : net_log_(NULL), + dnsrr_resolver_(NULL), http_transaction_factory_(NULL), ftp_transaction_factory_(NULL), http_auth_handler_factory_(NULL), diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index 5198fa3..96de77d 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -22,6 +22,7 @@ namespace net { class CookiePolicy; class CookieStore; +class DnsRRResolver; class FtpTransactionFactory; class HostResolver; class HttpAuthHandlerFactory; @@ -46,6 +47,10 @@ class URLRequestContext return host_resolver_; } + net::DnsRRResolver* dnsrr_resolver() const { + return dnsrr_resolver_; + } + // Get the proxy service for this context. net::ProxyService* proxy_service() const { return proxy_service_; @@ -113,6 +118,7 @@ class URLRequestContext // subclasses. net::NetLog* net_log_; net::HostResolver* host_resolver_; + net::DnsRRResolver* dnsrr_resolver_; scoped_refptr<net::ProxyService> proxy_service_; scoped_refptr<net::SSLConfigService> ssl_config_service_; net::HttpTransactionFactory* http_transaction_factory_; diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index 706aff9..99aeda5 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -161,6 +161,7 @@ class TestURLRequestContext : public URLRequestContext { host_resolver_); http_transaction_factory_ = new net::HttpCache( net::HttpNetworkLayer::CreateFactory(host_resolver_, + NULL, proxy_service_, ssl_config_service_, http_auth_handler_factory_, |