Make CertVerifier a pure virtual interface.

The existing CertVerifier implementation has been renamed to MultiThreadedCertVerifier, consistent with ProxyResolver naming. This is patch 1 of N for http://crbug.com/114343 BUG=114343 TEST=Compiles and existing unittests pass. Review URL: https://chromiumcodereview.appspot.com/9476035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128090 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Mar 21, 2012 · 9f59fac · 9f59fac
1 parent 48f6766
commit 9f59fac
Show file tree

Hide file tree

Showing 45 changed files with 870 additions and 736 deletions.
diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc
@@ -615,7 +615,7 @@ class SSLChan : public MessageLoopForIO::Watcher {
         net::ClientSocketFactory::GetDefaultFactory();
     net::SSLClientSocketContext ssl_context;
     if (!cert_verifier_.get())
-      cert_verifier_.reset(new net::CertVerifier());
+      cert_verifier_.reset(net::CertVerifier::CreateDefault());
     ssl_context.cert_verifier = cert_verifier_.get();
     socket_.reset(factory->CreateSSLClientSocket(
         handle, host_port_pair_, ssl_config_, NULL, ssl_context));

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
@@ -393,7 +393,7 @@ void IOThread::Init() {
       &system_enable_referrers_));
   globals_->host_resolver.reset(
       CreateGlobalHostResolver(net_log_));
-  globals_->cert_verifier.reset(new net::CertVerifier);
+  globals_->cert_verifier.reset(net::CertVerifier::CreateDefault());
   globals_->transport_security_state.reset(new net::TransportSecurityState(""));
   globals_->ssl_config_service = GetSSLConfigService();
   globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(

diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
@@ -72,7 +72,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
 
     // The rest of the dependencies are standard, and don't depend on the
     // experiment being run.
-    storage_.set_cert_verifier(new net::CertVerifier);
+    storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
     storage_.set_ftp_transaction_factory(
         new net::FtpNetworkLayer(host_resolver()));
     storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);

diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
@@ -108,7 +108,7 @@ class ConnectionTesterTest : public PlatformTest {
   net::TestServer test_server_;
   ConnectionTesterDelegate test_delegate_;
   net::MockHostResolver host_resolver_;
-  net::CertVerifier cert_verifier_;
+  scoped_ptr<net::CertVerifier> cert_verifier_;
   scoped_ptr<net::ProxyService> proxy_service_;
   scoped_refptr<net::SSLConfigService> ssl_config_service_;
   scoped_ptr<net::HttpTransactionFactory> http_transaction_factory_;
@@ -119,15 +119,16 @@ class ConnectionTesterTest : public PlatformTest {
  private:
   void InitializeRequestContext() {
     proxy_script_fetcher_context_->set_host_resolver(&host_resolver_);
-    proxy_script_fetcher_context_->set_cert_verifier(&cert_verifier_);
+    cert_verifier_.reset(net::CertVerifier::CreateDefault());
+    proxy_script_fetcher_context_->set_cert_verifier(cert_verifier_.get());
     proxy_script_fetcher_context_->set_http_auth_handler_factory(
         &http_auth_handler_factory_);
     proxy_service_.reset(net::ProxyService::CreateDirect());
     proxy_script_fetcher_context_->set_proxy_service(proxy_service_.get());
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
     net::HttpNetworkSession::Params session_params;
     session_params.host_resolver = &host_resolver_;
-    session_params.cert_verifier = &cert_verifier_;
+    session_params.cert_verifier = cert_verifier_.get();
     session_params.http_auth_handler_factory = &http_auth_handler_factory_;
     session_params.ssl_config_service = ssl_config_service_;
     session_params.proxy_service = proxy_service_.get();

diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
@@ -115,7 +115,7 @@ ServiceURLRequestContext::ServiceURLRequestContext(
                                     NULL));
   storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
       net_proxy_config_service, 0u, NULL));
-  storage_.set_cert_verifier(new net::CertVerifier);
+  storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
   storage_.set_ftp_transaction_factory(
       new net::FtpNetworkLayer(host_resolver()));
   storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);

diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc
@@ -167,7 +167,7 @@ net::HostResolver* PepperMessageFilter::GetHostResolver() {
 
 net::CertVerifier* PepperMessageFilter::GetCertVerifier() {
   if (!cert_verifier_.get())
-    cert_verifier_.reset(new net::CertVerifier());
+    cert_verifier_.reset(net::CertVerifier::CreateDefault());
 
   return cert_verifier_.get();
 }

diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc
@@ -61,7 +61,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
         net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
                                       net::HostResolver::kDefaultRetryAttempts,
                                       NULL));
-    storage_->set_cert_verifier(new net::CertVerifier);
+    storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
     // TODO(jam): use v8 if possible, look at chrome code.
     storage_->set_proxy_service(
         net::ProxyService::CreateUsingSystemProxyResolver(

diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc
@@ -120,7 +120,8 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
       net::ClientSocketFactory* mock_client_socket_factory,
       const net::AddressList& address_list)
           : mock_client_socket_factory_(mock_client_socket_factory),
-            address_list_(address_list) {
+            address_list_(address_list),
+            cert_verifier_(net::CertVerifier::CreateDefault()) {
   }
 
   // ResolvingClientSocketFactory implementation.
@@ -134,7 +135,7 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
       net::ClientSocketHandle* transport_socket,
       const net::HostPortPair& host_and_port) {
     net::SSLClientSocketContext context;
-    context.cert_verifier = &cert_verifier_;
+    context.cert_verifier = cert_verifier_.get();
     return mock_client_socket_factory_->CreateSSLClientSocket(
         transport_socket, host_and_port, ssl_config_, NULL, context);
   }
@@ -143,7 +144,7 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
   scoped_ptr<net::ClientSocketFactory> mock_client_socket_factory_;
   net::AddressList address_list_;
   net::SSLConfig ssl_config_;
-  net::CertVerifier cert_verifier_;
+  scoped_ptr<net::CertVerifier> cert_verifier_;
 };
 
 class ChromeAsyncSocketTest

diff --git a/net/base/cert_database.cc b/net/base/cert_database.cc
@@ -6,7 +6,6 @@
 
 #include "base/memory/singleton.h"
 #include "base/observer_list_threadsafe.h"
-#include "net/base/x509_certificate.h"
 
 namespace net {
 

diff --git a/net/base/cert_database.h b/net/base/cert_database.h
@@ -14,14 +14,12 @@
 #include "base/string16.h"
 #include "net/base/cert_type.h"
 #include "net/base/net_export.h"
+#include "net/base/x509_certificate.h"
 
 namespace net {
 
 class CryptoModule;
 typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
-class X509Certificate;
-typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
-
 
 // This class provides functions to manipulate the local
 // certificate store.