Revert "net: Plumb DnsCertProvenanceChecker around."

This reverts commit r66970.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66974 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 58 deletions

diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 4ec3939..159c674 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -33,7 +33,6 @@
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher.h"
 #include "net/proxy/proxy_service.h"
-#include "net/socket/dns_cert_provenance_checker.h"
 #include "net/url_request/url_request.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ -224,47 +223,6 @@ class ChromeCookieMonsterDelegate : public net::CookieMonster::Delegate {
 };
 
 // ----------------------------------------------------------------------------
-// Implementation of DnsCertProvenanceChecker
-// ----------------------------------------------------------------------------
-
-// WARNING: do not use this with anything other than the main
-// ChromeURLRequestContext. Eventually we'll want to have the other contexts
-// point to the main ChromeURLRequestContext, which then causes lifetime
-// ordering issues wrt ChromeURLRequestContexts, since we're using a raw
-// pointer, and we'll get shutdown ordering problems.
-
-class ChromeDnsCertProvenanceChecker :
-    public net::DnsCertProvenanceChecker,
-    public net::DnsCertProvenanceChecker::Delegate {
- public:
-  ChromeDnsCertProvenanceChecker(
-      net::DnsRRResolver* dnsrr_resolver,
-      ChromeURLRequestContext* url_req_context)
-      : dnsrr_resolver_(dnsrr_resolver),
-        url_req_context_(url_req_context) {
-  }
-
-  // DnsCertProvenanceChecker interface
-  virtual void DoAsyncVerification(
-      const std::string& hostname,
-      const std::vector<base::StringPiece>& der_certs) {
-    net::DnsCertProvenanceChecker::DoAsyncLookup(hostname, der_certs,
-                                                 dnsrr_resolver_, this);
-  }
-
-  // DnsCertProvenanceChecker::Delegate interface
-  virtual void OnDnsCertLookupFailed(
-      const std::string& hostname,
-      const std::vector<std::string>& der_certs) {
-    // Currently unimplemented.
-  }
-
- private:
-  net::DnsRRResolver* const dnsrr_resolver_;
-  ChromeURLRequestContext* const url_req_context_;
-};
-
-// ----------------------------------------------------------------------------
 // Helper factories
 // ----------------------------------------------------------------------------
 
@@ -307,12 +265,6 @@ ChromeURLRequestContext* FactoryForOriginal::Create() {
   context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
 
-  /* Disabled for now due to Chrome Frame linking issues on Windows.
-  context->set_dns_cert_checker(
-      new ChromeDnsCertProvenanceChecker(
-          io_thread_globals->dnsrr_resolver.get(),
-          context)); */
-
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   context->set_proxy_service(
@@ -328,7 +280,6 @@ ChromeURLRequestContext* FactoryForOriginal::Create() {
   net::HttpCache* cache =
       new net::HttpCache(context->host_resolver(),
                          context->dnsrr_resolver(),
-                         context->dns_cert_checker(),
                          context->proxy_service(),
                          context->ssl_config_service(),
                          context->http_auth_handler_factory(),
@@ -455,7 +406,6 @@ ChromeURLRequestContext* FactoryForOffTheRecord::Create() {
   net::HttpCache* cache =
       new net::HttpCache(context->host_resolver(),
                          context->dnsrr_resolver(),
-                         NULL /* dns_cert_checker */,
                          context->proxy_service(),
                          context->ssl_config_service(),
                          context->http_auth_handler_factory(),
@@ -548,7 +498,6 @@ ChromeURLRequestContext* FactoryForMedia::Create() {
     // new set of network stack.
     cache = new net::HttpCache(main_context->host_resolver(),
                                main_context->dnsrr_resolver(),
-                               NULL /* dns_cert_checker */,
                                main_context->proxy_service(),
                                main_context->ssl_config_service(),
                                main_context->http_auth_handler_factory(),
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index d7c08c0..72a31af 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -33,7 +33,6 @@ class PrefService;
 class Profile;
 
 namespace net {
-class DnsCertProvenanceChecker;
 class NetworkDelegate;
 class ProxyConfig;
 }
@@ -131,9 +130,6 @@ class ChromeURLRequestContext : public URLRequestContext {
   void set_dnsrr_resolver(net::DnsRRResolver* dnsrr_resolver) {
     dnsrr_resolver_ = dnsrr_resolver;
   }
-  void set_dns_cert_checker(net::DnsCertProvenanceChecker* ctx) {
-    dns_cert_checker_.reset(ctx);
-  }
   void set_http_transaction_factory(net::HttpTransactionFactory* factory) {
     http_transaction_factory_ = factory;
   }
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 35a9a71..8f762ef 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -65,7 +65,6 @@ class ExperimentURLRequestContext : public URLRequestContext {
         host_resolver_);
     http_transaction_factory_ = new net::HttpCache(
         net::HttpNetworkLayer::CreateFactory(host_resolver_, dnsrr_resolver_,
-            NULL /* dns_cert_checker */,
             NULL /* ssl_host_info_factory */, proxy_service_,
             ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
         net::HttpCache::DefaultBackend::InMemory(0));
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index ce32f67..c7268f5 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -125,7 +125,6 @@ ServiceURLRequestContext::ServiceURLRequestContext(
   http_transaction_factory_ = new net::HttpCache(
       net::HttpNetworkLayer::CreateFactory(host_resolver_,
                                            dnsrr_resolver_,
-                                           NULL /* dns_cert_checker */,
                                            NULL /* ssl_host_info_factory */,
                                            proxy_service_,
                                            ssl_config_service_,
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 7b2b4e0..4fc85d1 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -281,7 +281,6 @@ class PluginInstallerDownloadTest
       http_transaction_factory_ = new net::HttpCache(
           net::HttpNetworkLayer::CreateFactory(host_resolver_,
                                                NULL /* dnsrr_resolver */,
-                                               NULL /* dns_cert_checker */,
                                                NULL /* ssl_host_info_factory */,
                                                proxy_service_,
                                                ssl_config_service_,