diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 18:27:40 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 18:27:40 +0000 |
| commit | 3ed7496fcf01af71b591fa3ced274cfbdad78c9f (patch) | |
| tree | fc910174f4d25620ac2e4da476568773496084ca /chrome/browser/io_thread.cc | |
| parent | 2910a1b662c04634c9e8fd4d4d58b06c88ff729b (diff) | |
| download | chromium_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 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 8e00a2b..63c7601 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -41,7 +41,6 @@ #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" @@ -59,7 +58,6 @@ #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" @@ -447,7 +445,6 @@ 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( @@ -663,7 +660,6 @@ 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(); |