summaryrefslogtreecommitdiffstats
path: root/chrome/service
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 /chrome/service
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 'chrome/service')
-rw-r--r--chrome/service/net/service_url_request_context.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index 2b55d0c..9455c00 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -7,7 +7,6 @@
#include "chrome/service/service_process.h"
#include "net/base/cookie_monster.h"
#include "net/base/cookie_policy.h"
-#include "net/base/dnsrr_resolver.h"
#include "net/base/host_resolver.h"
#include "net/base/ssl_config_service_defaults.h"
#include "net/ftp/ftp_network_layer.h"
@@ -36,14 +35,12 @@ ServiceURLRequestContext::ServiceURLRequestContext() {
proxy_service_ =
net::ProxyService::Create(
proxy_config_service, false, 0u, this, NULL, NULL);
- dnsrr_resolver_ = new net::DnsRRResolver;
ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
ssl_config_service_ = new net::SSLConfigServiceDefaults;
http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
host_resolver_);
http_transaction_factory_ = new net::HttpCache(
net::HttpNetworkLayer::CreateFactory(host_resolver_,
- dnsrr_resolver_,
proxy_service_,
ssl_config_service_,
http_auth_handler_factory_,
@@ -60,5 +57,4 @@ ServiceURLRequestContext::~ServiceURLRequestContext() {
delete ftp_transaction_factory_;
delete http_transaction_factory_;
delete http_auth_handler_factory_;
- delete dnsrr_resolver_;
}