Allow browser tests to use a MockCertVerifier

chrome/browser/profiles/profile_io_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 1072 matching lines @@
   use_system_key_slot_ = profile_params_->use_system_key_slot;
   if (use_system_key_slot_)
     EnableNSSSystemKeySlotForResourceContext(resource_context_.get());
 
   crypto::ScopedPK11Slot public_slot =
       crypto::GetPublicSlotForChromeOSUser(username_hash_);
   // The private slot won't be ready by this point. It shouldn't be necessary
   // for cert trust purposes anyway.
   scoped_refptr<net::CertVerifyProc> verify_proc(
       new chromeos::CertVerifyProcChromeOS(public_slot.Pass()));
   if (policy_cert_verifier_) {

[estark, 2015/07/09 17:27:21]

I'm not quite sure how to deal with policy_cert_verifier_ for ChromeOS. My only
thought so far is that we could have another global
SetPolicyCertServiceFactory() function that CertVerifierBrowserTests set to a
mock factory that always returns nullptrs when asked to create a
PolicyCertVerifier. So we would end up not having a policy_cert_verifier_ in
CertVerifierBrowserTests and using the default CertVerifier instead.

     DCHECK_EQ(policy_cert_verifier_, cert_verifier_.get());
     policy_cert_verifier_->InitializeOnIOThread(verify_proc);
   } else {
-    cert_verifier_.reset(new net::MultiThreadedCertVerifier(verify_proc.get()));
+    cert_verifier_.reset(
+        net::CertVerifier::CreateWithVerifyProc(verify_proc.get()));
   }
   main_request_context_->set_cert_verifier(cert_verifier_.get());
 #else
   main_request_context_->set_cert_verifier(
       io_thread_globals->cert_verifier.get());
 #endif
 
   // Install the New Tab Page Interceptor.
   if (profile_params_->new_tab_page_interceptor.get()) {
     request_interceptors.push_back(
@@ skipping 189 matching lines @@
       new DevToolsNetworkTransactionFactory(
           network_controller_.get(), shared_session),
       shared_session->net_log(), backend));
 }
 
 void ProfileIOData::SetCookieSettingsForTesting(
     content_settings::CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }