summaryrefslogtreecommitdiffstats
path: root/net/proxy
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/proxy
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/proxy')
-rw-r--r--net/proxy/proxy_script_fetcher_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/proxy/proxy_script_fetcher_unittest.cc b/net/proxy/proxy_script_fetcher_unittest.cc
index ce54a9b..64754a4 100644
--- a/net/proxy/proxy_script_fetcher_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_unittest.cc
@@ -41,8 +41,8 @@ class RequestContext : public URLRequestContext {
ssl_config_service_ = new net::SSLConfigServiceDefaults;
http_transaction_factory_ = new net::HttpCache(
- net::HttpNetworkLayer::CreateFactory(host_resolver_, NULL,
- proxy_service_, ssl_config_service_, NULL, NULL, NULL),
+ net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_,
+ ssl_config_service_, NULL, NULL, NULL),
net::HttpCache::DefaultBackend::InMemory(0));
}