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