Allow browser tests to use a MockCertVerifier

net/cert/cert_verifier.cc

Index: net/cert/cert_verifier.cc
diff --git a/net/cert/cert_verifier.cc b/net/cert/cert_verifier.cc
index 4152d55e583255d7c11383000688cafab6ec9349..9bcb5d1c18fa973a5071a4e8b3d57b8bf9ba70e9 100644
--- a/net/cert/cert_verifier.cc
+++ b/net/cert/cert_verifier.cc
@@ -15,6 +15,9 @@
 
 namespace net {
 
+CertVerifier::~CertVerifier() {
+}
+
 bool CertVerifier::SupportsOCSPStapling() {
   return false;
 }
@@ -24,7 +27,43 @@ CertVerifier* CertVerifier::CreateDefault() {
   NOTIMPLEMENTED();
   return nullptr;
 #else
-  return new MultiThreadedCertVerifier(CertVerifyProc::CreateDefault());
+  return CreateWithVerifyProc(CertVerifyProc::CreateDefault());
+#endif
+}
+
+CertVerifier* CertVerifier::CreateWithVerifyProc(
+    CertVerifyProc* cert_verify_proc) {
+  CertVerifierFactory* factory = CertVerifierFactory::GetCertVerifierFactory();
+  if (!factory)
+    return nullptr;
+  return factory->CreateCertVerifier(cert_verify_proc);
+}
+
+CertVerifierFactory* CertVerifierFactory::cert_verifier_factory_ =
+    new CertVerifierFactory();
+
+CertVerifierFactory::CertVerifierFactory() {
+}
+
+CertVerifierFactory::~CertVerifierFactory() {
+}
+
+CertVerifierFactory* CertVerifierFactory::GetCertVerifierFactory() {
+  return cert_verifier_factory_;
+}
+
+void CertVerifierFactory::SetCertVerifierFactory(
+    CertVerifierFactory* cert_verifier_factory) {
+  cert_verifier_factory_ = cert_verifier_factory;
+}
+
+CertVerifier* CertVerifierFactory::CreateCertVerifier(
+    CertVerifyProc* cert_verify_proc) {
+#if defined(OS_NACL)
+  NOTIMPLEMENTED();
+  return nullptr;
+#else
+  return new MultiThreadedCertVerifier(cert_verify_proc);
 #endif
 }