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

5 files changed, 8 insertions, 7 deletions

diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc
index 66a3e1a..78236b6 100644
--- 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
index 9d5dd5f..e9196e7 100644
--- 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
index 59da2b8..453c901 100644
--- 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
index 50c43e7..099b355 100644
--- 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,7 +119,8 @@ 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());
@@ -127,7 +128,7 @@ class ConnectionTesterTest : public PlatformTest {
     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
index 2cf2b43..4fb2385 100644
--- 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);