diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 16:18:43 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 16:18:43 +0000 |
| commit | 93fa0379d245a901428bbd7f0424831a1df091e4 (patch) | |
| tree | 1079a9c031f5b77831f1f14bdf299c0fe0aea9cd /chrome/browser/io_thread.cc | |
| parent | 7c6c62215562506e63c70eab0484fbc04fa691bb (diff) | |
| download | chromium_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 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 63c7601..8e00a2b 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -41,6 +41,7 @@ #include "net/base/cert_verifier.h" #include "net/base/cookie_monster.h" #include "net/base/default_origin_bound_cert_store.h" +#include "net/base/dnsrr_resolver.h" #include "net/base/host_cache.h" #include "net/base/host_resolver.h" #include "net/base/host_resolver_impl.h" @@ -58,6 +59,7 @@ #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_script_fetcher_impl.h" #include "net/proxy/proxy_service.h" +#include "net/socket/dns_cert_provenance_checker.h" #if defined(USE_NSS) #include "net/ocsp/nss_ocsp.h" @@ -445,6 +447,7 @@ void IOThread::Init() { globals_->host_resolver.reset( CreateGlobalHostResolver(net_log_)); globals_->cert_verifier.reset(new net::CertVerifier); + globals_->dnsrr_resolver.reset(new net::DnsRRResolver); globals_->transport_security_state.reset(new net::TransportSecurityState("")); globals_->ssl_config_service = GetSSLConfigService(); globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( @@ -660,6 +663,7 @@ void IOThread::InitSystemRequestContextOnIOThread() { globals_->system_origin_bound_cert_service.get(); system_params.transport_security_state = globals_->transport_security_state.get(); + system_params.dns_cert_checker = NULL; system_params.ssl_host_info_factory = NULL; system_params.proxy_service = globals_->system_proxy_service.get(); system_params.ssl_config_service = globals_->ssl_config_service.get(); |