summaryrefslogtreecommitdiffstats
path: root/net/tools
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/tools
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/tools')
-rw-r--r--net/tools/fetch/fetch_client.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc
index 138bed3..3bdbcbf 100644
--- a/net/tools/fetch/fetch_client.cc
+++ b/net/tools/fetch/fetch_client.cc
@@ -147,7 +147,7 @@ int main(int argc, char**argv) {
scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory(
net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
if (use_cache) {
- factory = new net::HttpCache(host_resolver.get(), NULL, NULL, proxy_service,
+ factory = new net::HttpCache(host_resolver.get(), NULL, proxy_service,
ssl_config_service, http_auth_handler_factory.get(), NULL, NULL,
net::HttpCache::DefaultBackend::InMemory(0));
} else {
@@ -155,7 +155,6 @@ int main(int argc, char**argv) {
net::ClientSocketFactory::GetDefaultFactory(),
host_resolver.get(),
NULL /* dnsrr_resolver */,
- NULL /* dns_cert_checker */,
NULL /* ssl_host_info_factory */,
proxy_service,
ssl_config_service,