summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-22 18:17:13 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-22 18:17:13 +0000
commitbc04b24f04d8afd339c24d9f214481377de2aa56 (patch)
treeb98e69c38d120df34f00b6c1cd6124bceafdc29a /chrome_frame
parent36f1e277205d0bc6621866b1242ea7ee00166d4a (diff)
downloadchromium_src-bc04b24f04d8afd339c24d9f214481377de2aa56.zip
chromium_src-bc04b24f04d8afd339c24d9f214481377de2aa56.tar.gz
chromium_src-bc04b24f04d8afd339c24d9f214481377de2aa56.tar.bz2
Revert "net: Plumb DnsCertProvenanceChecker around."
This reverts commit r66970. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/metrics_service.cc1
-rw-r--r--chrome_frame/test/test_server_test.cc12
2 files changed, 3 insertions, 10 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index 24d8f3f..a3af50a 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);