Revert revert "net: plumb DnsRRResolver from IOThread to HttpNetworkSession."

Landed in r61789, reverted in r61801 in case it was causing Vista Tests
(dbg)(1) to crash. Turns out that it wasn't, so this is the reland.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61954 0039d316-1c4b-4281-b951-d872f2087c98

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_,