Replace c/b/nss_context by a KeyedService.

chrome/browser/chromeos/policy/user_network_configuration_updater.cc

Index: chrome/browser/chromeos/policy/user_network_configuration_updater.cc
diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc
index 3221bf1074be2be57df59f2d4b2506e6e9023020..67eabf5f1ee37aaf8a875b3088a999f002d7303c 100644
--- a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc
+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc
@@ -8,15 +8,10 @@
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "chrome/browser/chrome_notification_types.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 "chromeos/network/onc/onc_certificate_importer.h"
 #include "components/user_manager/user.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_source.h"
 #include "net/cert/x509_certificate.h"
 #include "policy/policy_constants.h"
 
@@ -27,16 +22,16 @@ UserNetworkConfigurationUpdater::~UserNetworkConfigurationUpdater() {}
 // static
 scoped_ptr<UserNetworkConfigurationUpdater>
 UserNetworkConfigurationUpdater::CreateForUserPolicy(
-    Profile* profile,
     bool allow_trusted_certs_from_policy,
     const user_manager::User& user,
     PolicyService* policy_service,
+    scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer,
     chromeos::ManagedNetworkConfigurationHandler* network_config_handler) {
   scoped_ptr<UserNetworkConfigurationUpdater> updater(
-      new UserNetworkConfigurationUpdater(profile,
-                                          allow_trusted_certs_from_policy,
+      new UserNetworkConfigurationUpdater(allow_trusted_certs_from_policy,
                                           user,
                                           policy_service,
+                                          certificate_importer.Pass(),
                                           network_config_handler));
   updater->Init();
   return updater.Pass();
@@ -53,10 +48,10 @@ void UserNetworkConfigurationUpdater::RemoveTrustedCertsObserver(
 }
 
 UserNetworkConfigurationUpdater::UserNetworkConfigurationUpdater(
-    Profile* profile,
     bool allow_trusted_certs_from_policy,
     const user_manager::User& user,
     PolicyService* policy_service,
+    scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer,
     chromeos::ManagedNetworkConfigurationHandler* network_config_handler)
     : NetworkConfigurationUpdater(onc::ONC_SOURCE_USER_POLICY,
                                   key::kOpenNetworkConfiguration,
@@ -64,20 +59,9 @@ UserNetworkConfigurationUpdater::UserNetworkConfigurationUpdater(
                                   network_config_handler),
       allow_trusted_certificates_from_policy_(allow_trusted_certs_from_policy),
       user_(&user),
+      certificate_importer_(certificate_importer.Pass()),
       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.
-  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());
+  CHECK(certificate_importer_);
 }
 
 void UserNetworkConfigurationUpdater::GetWebTrustedCertificates(
@@ -96,13 +80,6 @@ void UserNetworkConfigurationUpdater::OnCertificatesImported(
 
 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_) {
-    pending_certificates_onc_.reset(certificates_onc.DeepCopy());
-    return;
-  }
-
   certificate_importer_->ImportCertificates(
       certificates_onc,
       onc_source_,
@@ -122,39 +99,6 @@ void UserNetworkConfigurationUpdater::ApplyNetworkPolicy(
                                      *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();
-
-  GetNSSCertDatabaseForProfile(
-      profile,
-      base::Bind(
-          &UserNetworkConfigurationUpdater::CreateAndSetCertificateImporter,
-          weak_factory_.GetWeakPtr()));
-}
-
-void UserNetworkConfigurationUpdater::CreateAndSetCertificateImporter(
-    net::NSSCertDatabase* database) {
-  DCHECK(database);
-  SetCertificateImporter(scoped_ptr<chromeos::onc::CertificateImporter>(
-      new chromeos::onc::CertificateImporterImpl(
-          content::BrowserThread::GetMessageLoopProxyForThread(
-              content::BrowserThread::IO),
-          database)));
-}
-
-void UserNetworkConfigurationUpdater::SetCertificateImporter(
-    scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer) {
-  certificate_importer_ = certificate_importer.Pass();
-
-  if (pending_certificates_onc_)
-    ImportCertificates(*pending_certificates_onc_);
-  pending_certificates_onc_.reset();
-}
-
 void UserNetworkConfigurationUpdater::NotifyTrustAnchorsChanged() {
   FOR_EACH_OBSERVER(WebTrustedCertsObserver,
                     observer_list_,