summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 18:27:40 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 18:27:40 +0000
commit3ed7496fcf01af71b591fa3ced274cfbdad78c9f (patch)
treefc910174f4d25620ac2e4da476568773496084ca /webkit/tools
parent2910a1b662c04634c9e8fd4d4d58b06c88ff729b (diff)
downloadchromium_src-3ed7496fcf01af71b591fa3ced274cfbdad78c9f.zip
chromium_src-3ed7496fcf01af71b591fa3ced274cfbdad78c9f.tar.gz
chromium_src-3ed7496fcf01af71b591fa3ced274cfbdad78c9f.tar.bz2
Revert: Revert "net: remove DNS certificate checking code."
Now with ChromeOS fix. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell_request_context.cc14
1 files changed, 9 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index c1c3e2c..e8fea2a 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -93,13 +93,17 @@ void TestShellRequestContext::Init(
cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread());
net::HttpCache* cache =
- new net::HttpCache(host_resolver(), cert_verifier(),
- origin_bound_cert_service(), NULL, NULL,
+ new net::HttpCache(host_resolver(),
+ cert_verifier(),
+ origin_bound_cert_service(),
+ NULL, // transport_security_state
proxy_service(),
- "" /* ssl_session_cache_shard */,
+ "", // ssl_session_cache_shard
ssl_config_service(),
- http_auth_handler_factory(), NULL,
- http_server_properties(), NULL,
+ http_auth_handler_factory(),
+ NULL, // network_delegate
+ http_server_properties(),
+ NULL, // netlog
backend);
cache->set_mode(cache_mode);