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 46 matching lines @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/sync_driver/pref_names.h"
 #include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/keygen_handler.h"
+#include "net/cert/cert_verifier.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
 #include "net/http/transport_security_persister.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/url_request/certificate_report_sender.h"
@@ skipping 72 matching lines @@
 #if defined(OS_MACOSX)
 #include "net/ssl/client_cert_store_mac.h"
 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::ResourceContext;
 
 namespace {
 
+net::CertVerifier* g_cert_verifier_for_testing = nullptr;
+
+net::CertVerifier* GetCertVerifierForTesting() {
+  if (g_cert_verifier_for_testing)
+    return g_cert_verifier_for_testing;
+  return nullptr;
+}

[Ryan Sleevi, 2015/08/04 18:24:34]

This function isn't necessary, is it? I mean, it's really just doing "return
g_cert_verifier_for_testing", since the only way line 163 fails if it it's
already nullptr. I'd just update line 1111 to point to this variable directly.

[estark, 2015/08/04 19:32:19]

Done.

+
 #if defined(DEBUG_DEVTOOLS)
 bool IsSupportedDevToolsURL(const GURL& url, base::FilePath* path) {
   std::string bundled_path_prefix(chrome::kChromeUIDevToolsBundledPath);
   bundled_path_prefix = "/" + bundled_path_prefix + "/";
 
   if (!url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.host() != chrome::kChromeUIDevToolsHost ||
       !base::StartsWith(url.path(), bundled_path_prefix,
                         base::CompareCase::INSENSITIVE_ASCII)) {
     return false;
@@ skipping 571 matching lines @@
            protocol_handlers->begin();
        it != protocol_handlers->end();
        ++it) {
     bool set_protocol = job_factory->SetProtocolHandler(
         it->first, it->second.release());
     DCHECK(set_protocol);
   }
   protocol_handlers->clear();
 }
 
+// static
+void ProfileIOData::SetCertVerifierForTesting(
+    net::CertVerifier* cert_verifier) {
+  g_cert_verifier_for_testing = cert_verifier;
+}
+
 content::ResourceContext* ProfileIOData::GetResourceContext() const {
   return resource_context_.get();
 }
 
 net::URLRequestContext* ProfileIOData::GetMainRequestContext() const {
   DCHECK(initialized_);
   return main_request_context_.get();
 }
 
 net::URLRequestContext* ProfileIOData::GetMediaRequestContext() const {
@@ skipping 326 matching lines @@
 
   if (profile_params_->resource_prefetch_predictor_observer_) {
     resource_prefetch_predictor_observer_.reset(
         profile_params_->resource_prefetch_predictor_observer_.release());
   }
 
 #if defined(ENABLE_SUPERVISED_USERS)
   supervised_user_url_filter_ = profile_params_->supervised_user_url_filter;
 #endif
 
+  net::CertVerifier* cert_verifier = GetCertVerifierForTesting();
 #if defined(OS_CHROMEOS)
   username_hash_ = profile_params_->username_hash;
   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_) {
-    DCHECK_EQ(policy_cert_verifier_, cert_verifier_.get());
-    policy_cert_verifier_->InitializeOnIOThread(verify_proc);
+  if (!cert_verifier) {

[Ryan Sleevi, 2015/08/04 18:24:34]

Rather than both sides of the #ifdef checking for cert_verifier (line 1124 you
do !cert_verifier, but line 1136 you do cert_verifier - thus making it hard to
match if/else pairs), why not lift the conditional up

line 1111
if (g_cert_verifier_for_testing) {
  main_request_context_->set_cert_verifier(g_cert_verifier_for_testing);
} else {
#if defined(OS_CHROMEOS)
  ...
#else
  ...
#endif
}

[estark, 2015/08/04 19:32:19]

Done.

+    if (policy_cert_verifier_) {
+      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 = cert_verifier_.get();
+  }
+  main_request_context_->set_cert_verifier(cert_verifier);
+#else
+  if (cert_verifier) {
+    main_request_context_->set_cert_verifier(cert_verifier);
   } else {
-    cert_verifier_.reset(new net::MultiThreadedCertVerifier(verify_proc.get()));
+    main_request_context_->set_cert_verifier(
+        io_thread_globals->cert_verifier.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(
         profile_params_->new_tab_page_interceptor.release());
   }
 
   InitializeInternal(
       network_delegate.Pass(), profile_params_.get(),
@@ skipping 184 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;
 }