summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-07 16:20:24 +0000
committerBen Murdoch <benm@google.com>2011-01-11 14:17:07 +0000
commit5b8df749ef4d7410ddbff37da80ef5e088f2e9e9 (patch)
tree45bcede6a77b2ee3de912b195a49f6a1b8ec8f3f /WebKit
parent479abbc9338478f312f5a1733d42742ce9e24139 (diff)
downloadexternal_webkit-5b8df749ef4d7410ddbff37da80ef5e088f2e9e9.zip
external_webkit-5b8df749ef4d7410ddbff37da80ef5e088f2e9e9.tar.gz
external_webkit-5b8df749ef4d7410ddbff37da80ef5e088f2e9e9.tar.bz2
Merge Chromium at 9.0.597.55: Add DnsCertChecker to constructor
See http://src.chromium.org/viewvc/chrome?view=rev&revision=66985 Change-Id: Ic4642c38646b94fb6db9e839a671cd335f9d5c6b
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/WebCache.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/WebCache.cpp b/WebKit/android/WebCoreSupport/WebCache.cpp
index c5705dd..07031c8 100644
--- a/WebKit/android/WebCoreSupport/WebCache.cpp
+++ b/WebKit/android/WebCoreSupport/WebCache.cpp
@@ -111,6 +111,7 @@ WebCache::WebCache(bool isPrivateBrowsing)
m_cache = new net::HttpCache(m_hostResolver.get(),
0, // dnsrr_resolver
+ 0, // dns_cert_checker
net::ProxyService::CreateWithoutProxyResolver(m_proxyConfigService, 0 /* net_log */),
net::SSLConfigService::CreateSystemSSLConfigService(),
net::HttpAuthHandlerFactory::CreateDefault(m_hostResolver.get()),