diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 19:33:18 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 19:33:18 +0000 |
| commit | 345c613b60d6f2b4cce28dcc130b37057d94759b (patch) | |
| tree | fa732fc44ec95b03fde762f21ee602c4960f3860 /chrome_frame | |
| parent | fb4c1c787dcb0b082c5c4a65445df1bf65b71519 (diff) | |
| download | chromium_src-345c613b60d6f2b4cce28dcc130b37057d94759b.zip chromium_src-345c613b60d6f2b4cce28dcc130b37057d94759b.tar.gz chromium_src-345c613b60d6f2b4cce28dcc130b37057d94759b.tar.bz2 | |
Revert "Revert "net: Plumb DnsCertProvenanceChecker around.""
(See r66623 for details.)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66985 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, 10 insertions, 3 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index a3af50a..24d8f3f 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -176,6 +176,7 @@ 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 fae70ae..450f021 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -70,9 +70,15 @@ class URLRequestTestContext : public URLRequestContext { host_resolver_); http_transaction_factory_ = new net::HttpCache( net::HttpNetworkLayer::CreateFactory( - host_resolver_, NULL /* dnsrr_resolver */, - NULL /* ssl_host_info_factory */, proxy_service_, - ssl_config_service_, http_auth_handler_factory_, NULL, NULL), + 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 */), net::HttpCache::DefaultBackend::InMemory(0)); // In-memory cookie store. cookie_store_ = new net::CookieMonster(NULL, NULL); |