summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 17:29:30 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 17:29:30 +0000
commit6ae89674d638729059018d02c11cb0881b9cf14f (patch)
treecf4d422d34148fc0a907f27d14ac881af412220e /net/url_request
parent2fb382fd01716825e026c7833b6d170b5f412a08 (diff)
downloadchromium_src-6ae89674d638729059018d02c11cb0881b9cf14f.zip
chromium_src-6ae89674d638729059018d02c11cb0881b9cf14f.tar.gz
chromium_src-6ae89674d638729059018d02c11cb0881b9cf14f.tar.bz2
Revert "net: plumb DnsRRResolver from IOThread to HttpNetworkSession."
This reverts r61789. It may have broken Vista Tests (dbg), maybe. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_context.cc1
-rw-r--r--net/url_request/url_request_context.h6
-rw-r--r--net/url_request/url_request_unittest.h1
3 files changed, 0 insertions, 8 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 329f83f..0ea8477 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -10,7 +10,6 @@
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 96de77d..5198fa3 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -22,7 +22,6 @@
namespace net {
class CookiePolicy;
class CookieStore;
-class DnsRRResolver;
class FtpTransactionFactory;
class HostResolver;
class HttpAuthHandlerFactory;
@@ -47,10 +46,6 @@ 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_;
@@ -118,7 +113,6 @@ 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 99aeda5..706aff9 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -161,7 +161,6 @@ 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_,