Allow browser tests to use a MockCertVerifier

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 6d2307533e18f6ff2dcf63dfcf2d1fffd3071c2f..a3fc5fcec9fd9b4748f2d2f29ce2cfe5d26a6b9e 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -663,14 +663,15 @@ void IOThread::Init() {
   tracked_objects::ScopedTracker tracking_profile6(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "466432 IOThread::InitAsync::UpdateDnsClientEnabled::End"));
+  net::CertVerifyProc* cert_verify_proc;
 #if defined(OS_CHROMEOS)
   // Creates a CertVerifyProc that doesn't allow any profile-provided certs.
-  globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier(
-      new chromeos::CertVerifyProcChromeOS()));
+  cert_verify_proc = new chromeos::CertVerifyProcChromeOS();
 #else
-  globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier(
-      net::CertVerifyProc::CreateDefault()));
+  cert_verify_proc = net::CertVerifyProc::CreateDefault();
 #endif
+  globals_->cert_verifier.reset(
+      net::CertVerifier::CreateWithVerifyProc(cert_verify_proc));
 
   globals_->transport_security_state.reset(new net::TransportSecurityState());