diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 22:26:29 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 22:26:29 +0000 |
| commit | 34e3be8355b2fd61cd999226c4b8043af6c2200a (patch) | |
| tree | 46ab94ce387e77d1d97c05f1aeef1ba168c73246 /chrome_frame | |
| parent | 447af0b1e8ca4638cdcc554ca5e3583015f23e60 (diff) | |
| download | chromium_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 'chrome_frame')
| -rw-r--r-- | chrome_frame/metrics_service.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/test/test_server_test.cc | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index c970e7a..eecf468 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -176,7 +176,6 @@ class ChromeFrameUploadRequestContext : public URLRequestContext { http_transaction_factory_ = new net::HttpCache( net::HttpNetworkLayer::CreateFactory(host_resolver_, NULL /* dnsrr_resovler */, - NULL /* dns_cert_checker*/, NULL /* ssl_host_info */, proxy_service_, ssl_config_service_, diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index 450f021..fae70ae 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -70,15 +70,9 @@ class URLRequestTestContext : public URLRequestContext { host_resolver_); http_transaction_factory_ = new net::HttpCache( net::HttpNetworkLayer::CreateFactory( - host_resolver_, - NULL /* dnsrr_resolver */, - NULL /* dns_cert_checker */, - NULL /* ssl_host_info_factory */, - proxy_service_, - ssl_config_service_, - http_auth_handler_factory_, - NULL /* network_delegate */, - NULL /* net_log */), + host_resolver_, NULL /* dnsrr_resolver */, + NULL /* ssl_host_info_factory */, proxy_service_, + ssl_config_service_, http_auth_handler_factory_, NULL, NULL), net::HttpCache::DefaultBackend::InMemory(0)); // In-memory cookie store. cookie_store_ = new net::CookieMonster(NULL, NULL); |