Cleanup tests using SetSkipCertificateImporterCreationForTest

chrome/browser/chromeos/policy/user_network_configuration_updater.cc

 // Copyright 2013 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/chromeos/policy/user_network_configuration_updater.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/browser/net/nss_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
 #include "content/public/browser/notification_source.h"
 #include "net/cert/x509_certificate.h"
 #include "policy/policy_constants.h"
 
-namespace {
-
-bool skip_certificate_importer_creation_for_test = false;
-
-}  // namespace
-
 namespace policy {
 
 UserNetworkConfigurationUpdater::~UserNetworkConfigurationUpdater() {}
 
 // static
 scoped_ptr<UserNetworkConfigurationUpdater>
 UserNetworkConfigurationUpdater::CreateForUserPolicy(
     Profile* profile,
     bool allow_trusted_certs_from_policy,
     const chromeos::User& user,
@@ skipping 29 matching lines @@
                                   key::kOpenNetworkConfiguration,
                                   policy_service,
                                   network_config_handler),
       allow_trusted_certificates_from_policy_(allow_trusted_certs_from_policy),
       user_(&user),
       weak_factory_(this) {
   // The updater is created with |certificate_importer_| unset and is
   // responsible for creating it. This requires |GetNSSCertDatabaseForProfile|
   // call, which is not safe before the profile initialization is finalized.
   // Thus, listen for PROFILE_ADDED notification, on which |cert_importer_|
-  // creation should start. This behaviour can be disabled in tests.
-  if (!skip_certificate_importer_creation_for_test) {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_PROFILE_ADDED,
-                   content::Source<Profile>(profile));
-  }
+  // creation should start.
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_PROFILE_ADDED,
+                 content::Source<Profile>(profile));
 }
 
 void UserNetworkConfigurationUpdater::SetCertificateImporterForTest(
     scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer) {
   SetCertificateImporter(certificate_importer.Pass());
 }
 
-// static
-void UserNetworkConfigurationUpdater::
-SetSkipCertificateImporterCreationForTest(bool skip) {
-  skip_certificate_importer_creation_for_test = skip;
-}
-
 void UserNetworkConfigurationUpdater::GetWebTrustedCertificates(
     net::CertificateList* certs) const {
   *certs = web_trust_certs_;
 }
 
 void UserNetworkConfigurationUpdater::ImportCertificates(
     const base::ListValue& certificates_onc) {
   // If certificate importer is not yet set, cache the certificate onc. It will
   // be imported when the certificate importer gets set.
   if (!certificate_importer_) {
@@ skipping 22 matching lines @@
                                      *global_network_config);
 }
 
 void UserNetworkConfigurationUpdater::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_PROFILE_ADDED);
   Profile* profile = content::Source<Profile>(source).ptr();
 
-  if (skip_certificate_importer_creation_for_test)
-    return;
-
   GetNSSCertDatabaseForProfile(
       profile,
       base::Bind(
           &UserNetworkConfigurationUpdater::CreateAndSetCertificateImporter,
           weak_factory_.GetWeakPtr()));
 }
 
 void UserNetworkConfigurationUpdater::CreateAndSetCertificateImporter(
     net::NSSCertDatabase* database) {
   DCHECK(database);
@@ skipping 10 matching lines @@
   pending_certificates_onc_.reset();
 }
 
 void UserNetworkConfigurationUpdater::NotifyTrustAnchorsChanged() {
   FOR_EACH_OBSERVER(WebTrustedCertsObserver,
                     observer_list_,
                     OnTrustAnchorsChanged(web_trust_certs_));
 }
 
 }  // namespace policy