summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
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_frame/test
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_frame/test')
-rw-r--r--chrome_frame/test/test_server_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 3d391f6..4fac1f7 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -69,8 +69,7 @@ class URLRequestTestContext : public URLRequestContext {
http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
host_resolver_);
http_transaction_factory_ = new net::HttpCache(
- net::HttpNetworkLayer::CreateFactory(
- host_resolver_, NULL /* dnsrr_resolver */, proxy_service_,
+ net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_,
ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
net::HttpCache::DefaultBackend::InMemory(0));
// In-memory cookie store.