summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 22:26:29 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 22:26:29 +0000
commit34e3be8355b2fd61cd999226c4b8043af6c2200a (patch)
tree46ab94ce387e77d1d97c05f1aeef1ba168c73246 /net/proxy
parent447af0b1e8ca4638cdcc554ca5e3583015f23e60 (diff)
downloadchromium_src-34e3be8355b2fd61cd999226c4b8043af6c2200a.zip
chromium_src-34e3be8355b2fd61cd999226c4b8043af6c2200a.tar.gz
chromium_src-34e3be8355b2fd61cd999226c4b8043af6c2200a.tar.bz2
Revert "net: Plumb DnsCertProvenanceChecker around."
This reverts commit r66623. Some how it causes libnspr4.dll to be linked in Chrome Frame builds. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r--net/proxy/proxy_script_fetcher_impl_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index 6266b68..4734997 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -43,7 +43,7 @@ class RequestContext : public URLRequestContext {
ssl_config_service_ = new net::SSLConfigServiceDefaults;
http_transaction_factory_ = new net::HttpCache(
- net::HttpNetworkLayer::CreateFactory(host_resolver_, NULL, NULL, NULL,
+ net::HttpNetworkLayer::CreateFactory(host_resolver_, NULL, NULL,
proxy_service_, ssl_config_service_, NULL, NULL, NULL),
net::HttpCache::DefaultBackend::InMemory(0));
}