Give two cert testing classes unique names

A second WrappedTestingCertVerifier and
g_cert_verifier_for_testing just arrived and in some
extreme (non standard) jumbo build configurations those
ended up in the same translation unit. Since translation units
only have one common anonymous namespace, there was a symbol clash.

This patch renames the global variables to
g_cert_verifier_for_io_thread_testing and
g_cert_verifier_for_profile_io_data_testing and renames the classes
to WrappedCertVerifierForIoThreadTesting and
WrappedCertVerifierForProfileIoDataTesting.

Change-Id: I41549bc81943864f64ce304220e20ab00d91c889
Reviewed-on: https://chromium-review.googlesource.com/992494Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#548029}

chrome/browser/io_thread.cc

@@ -145,15 +145,15 @@ class SafeBrowsingURLRequestContext;
 
 namespace {
 
-net::CertVerifier* g_cert_verifier_for_testing = nullptr;
+net::CertVerifier* g_cert_verifier_for_io_thread_testing = nullptr;
 
-// A CertVerifier that forwards all requests to |g_cert_verifier_for_testing|.
-// This is used to allow IOThread to have its own
-// std::unique_ptr<net::CertVerifier> while forwarding calls to the static
-// verifier.
-class WrappedTestingCertVerifier : public net::CertVerifier {
+// A CertVerifier that forwards all requests to
+// |g_cert_verifier_for_io_thread_testing|. This is used to allow IOThread to
+// have its own std::unique_ptr<net::CertVerifier> while forwarding calls to the
+// static verifier.
+class WrappedCertVerifierForIOThreadTesting : public net::CertVerifier {
  public:
-  ~WrappedTestingCertVerifier() override = default;
+  ~WrappedCertVerifierForIOThreadTesting() override = default;
 
   // CertVerifier implementation
   int Verify(const RequestParams& params,
@@ -163,15 +163,15 @@ class WrappedTestingCertVerifier : public net::CertVerifier {
              std::unique_ptr<Request>* out_req,
              const net::NetLogWithSource& net_log) override {
     verify_result->Reset();
-    if (!g_cert_verifier_for_testing)
+    if (!g_cert_verifier_for_io_thread_testing)
       return net::ERR_FAILED;
-    return g_cert_verifier_for_testing->Verify(params, crl_set, verify_result,
-                                               callback, out_req, net_log);
+    return g_cert_verifier_for_io_thread_testing->Verify(
+        params, crl_set, verify_result, callback, out_req, net_log);
   }
   bool SupportsOCSPStapling() override {
-    if (!g_cert_verifier_for_testing)
+    if (!g_cert_verifier_for_io_thread_testing)
       return false;
-    return g_cert_verifier_for_testing->SupportsOCSPStapling();
+    return g_cert_verifier_for_io_thread_testing->SupportsOCSPStapling();
   }
 };
 
@@ -628,7 +628,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
 
 // static
 void IOThread::SetCertVerifierForTesting(net::CertVerifier* cert_verifier) {
-  g_cert_verifier_for_testing = cert_verifier;
+  g_cert_verifier_for_io_thread_testing = cert_verifier;
 }
 
 void IOThread::UpdateServerWhitelist() {
@@ -796,8 +796,8 @@ void IOThread::ConstructSystemRequestContext() {
   builder->set_host_resolver(std::move(host_resolver));
 
   std::unique_ptr<net::CertVerifier> cert_verifier;
-  if (g_cert_verifier_for_testing) {
-    cert_verifier = std::make_unique<WrappedTestingCertVerifier>();
+  if (g_cert_verifier_for_io_thread_testing) {
+    cert_verifier = std::make_unique<WrappedCertVerifierForIOThreadTesting>();
   } else {
 #if defined(OS_CHROMEOS)
     // Creates a CertVerifyProc that doesn't allow any profile-provided certs.

chrome/browser/profiles/profile_io_data.cc

@@ -184,15 +184,15 @@ using content::ResourceContext;
 
 namespace {
 
-net::CertVerifier* g_cert_verifier_for_testing = nullptr;
+net::CertVerifier* g_cert_verifier_for_profile_io_data_testing = nullptr;
 
-// A CertVerifier that forwards all requests to |g_cert_verifier_for_testing|.
-// This is used to allow Profiles to have their own
-// std::unique_ptr<net::CertVerifier> while forwarding calls to the shared
-// verifier.
-class WrappedTestingCertVerifier : public net::CertVerifier {
+// A CertVerifier that forwards all requests to
+// |g_cert_verifier_for_profile_io_data_testing|. This is used to allow Profiles
+// to have their own std::unique_ptr<net::CertVerifier> while forwarding calls
+// to the shared verifier.
+class WrappedCertVerifierForProfileIODataTesting : public net::CertVerifier {
  public:
-  ~WrappedTestingCertVerifier() override = default;
+  ~WrappedCertVerifierForProfileIODataTesting() override = default;
 
   // CertVerifier implementation
   int Verify(const RequestParams& params,
@@ -202,15 +202,15 @@ class WrappedTestingCertVerifier : public net::CertVerifier {
              std::unique_ptr<Request>* out_req,
              const net::NetLogWithSource& net_log) override {
     verify_result->Reset();
-    if (!g_cert_verifier_for_testing)
+    if (!g_cert_verifier_for_profile_io_data_testing)
       return net::ERR_FAILED;
-    return g_cert_verifier_for_testing->Verify(params, crl_set, verify_result,
-                                               callback, out_req, net_log);
+    return g_cert_verifier_for_profile_io_data_testing->Verify(
+        params, crl_set, verify_result, callback, out_req, net_log);
   }
   bool SupportsOCSPStapling() override {
-    if (!g_cert_verifier_for_testing)
+    if (!g_cert_verifier_for_profile_io_data_testing)
       return false;
-    return g_cert_verifier_for_testing->SupportsOCSPStapling();
+    return g_cert_verifier_for_profile_io_data_testing->SupportsOCSPStapling();
   }
 };
 
@@ -541,7 +541,7 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   network_prediction_options_.MoveToThread(io_task_runner);
 
 #if defined(OS_CHROMEOS)
-  if (!g_cert_verifier_for_testing) {
+  if (!g_cert_verifier_for_profile_io_data_testing) {
     profile_params_->policy_cert_verifier =
         policy::PolicyCertServiceFactory::CreateForProfile(profile);
   }
@@ -851,7 +851,7 @@ void ProfileIOData::AddProtocolHandlersToBuilder(
 // static
 void ProfileIOData::SetCertVerifierForTesting(
     net::CertVerifier* cert_verifier) {
-  g_cert_verifier_for_testing = cert_verifier;
+  g_cert_verifier_for_profile_io_data_testing = cert_verifier;
 }
 
 content::ResourceContext* ProfileIOData::GetResourceContext() const {
@@ -1143,8 +1143,9 @@ void ProfileIOData::Init(
   certificate_provider_ = std::move(profile_params_->certificate_provider);
 #endif
 
-  if (g_cert_verifier_for_testing) {
-    builder->SetCertVerifier(std::make_unique<WrappedTestingCertVerifier>());
+  if (g_cert_verifier_for_profile_io_data_testing) {
+    builder->SetCertVerifier(
+        std::make_unique<WrappedCertVerifierForProfileIODataTesting>());
   } else {
     std::unique_ptr<net::CertVerifier> cert_verifier;
 #if defined(OS_CHROMEOS)