Allow browser tests to use a MockCertVerifier

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 3f9dbafc7af6feff544a813cdbe6fcc61d5cfd6a..c9e96304a8c79e706d0d7c1a94073719f223350d 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -60,6 +60,7 @@ class InfoMap;
 namespace net {
 class CertificateReportSender;
 class CertVerifier;
+class CertVerifierFactory;
 class ChannelIDService;
 class CookieStore;
 class FraudulentCertificateReporter;
@@ -109,6 +110,11 @@ class ProfileIOData {
       net::URLRequestJobFactoryImpl* job_factory,
       content::ProtocolHandlerMap* protocol_handlers);
 
+  // Sets a global CertVerifierFactory; tests can use this to create
+  // per-profile CertVerifiers.
+  static void SetCertVerifierFactoryForTesting(
+      net::CertVerifierFactory* cert_verifier_factory);
+
   // Called by Profile.
   content::ResourceContext* GetResourceContext() const;
 
@@ -551,10 +557,10 @@ class ProfileIOData {
   // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
   // case, the verifier is owned by  |cert_verifier_|. Otherwise, set to NULL.
   mutable policy::PolicyCertVerifier* policy_cert_verifier_;
-  mutable scoped_ptr<net::CertVerifier> cert_verifier_;
   mutable std::string username_hash_;
   mutable bool use_system_key_slot_;
 #endif
+  mutable scoped_ptr<net::CertVerifier> cert_verifier_;

[Ryan Sleevi, 2015/08/04 08:28:44]

Since policy_cert_verifier_ points to this (line 557), should this perhaps be
before (line 556), so that the non-owning pointer is destroyed before the owning
pointer?

[estark, 2015/08/04 17:44:38]

Done.

 
   mutable scoped_ptr<net::TransportSecurityPersister>
       transport_security_persister_;