Replace c/b/nss_context by a KeyedService.

chrome/browser/chromeos/policy/user_network_configuration_updater_factory.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_factory.h"
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/net/cert_database_service_factory.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/network/network_handler.h"
+#include "components/cert_database/public/cert_database_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 
 namespace policy {
 
 // static
 UserNetworkConfigurationUpdater*
 UserNetworkConfigurationUpdaterFactory::GetForProfile(Profile* profile) {
   return static_cast<UserNetworkConfigurationUpdater*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 UserNetworkConfigurationUpdaterFactory*
 UserNetworkConfigurationUpdaterFactory::GetInstance() {
   return Singleton<UserNetworkConfigurationUpdaterFactory>::get();
 }
 
 UserNetworkConfigurationUpdaterFactory::UserNetworkConfigurationUpdaterFactory()
     : BrowserContextKeyedServiceFactory(
           "UserNetworkConfigurationUpdater",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(ProfilePolicyConnectorFactory::GetInstance());
+  DependsOn(CertDatabaseServiceFactory::GetInstance());
 }
 
 UserNetworkConfigurationUpdaterFactory::
     ~UserNetworkConfigurationUpdaterFactory() {}
 
 content::BrowserContext*
 UserNetworkConfigurationUpdaterFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
@@ skipping 21 matching lines @@
   // also http://crbug.com/310685 .
   if (user != user_manager::UserManager::Get()->GetPrimaryUser())
     return NULL;
 
   const bool allow_trusted_certs_from_policy =
       user->GetType() == user_manager::USER_TYPE_REGULAR;
 
   ProfilePolicyConnector* profile_connector =
       ProfilePolicyConnectorFactory::GetForProfile(profile);
 
-  return UserNetworkConfigurationUpdater::CreateForUserPolicy(
-      profile,
-      allow_trusted_certs_from_policy,
-      *user,
-      profile_connector->policy_service(),
-      chromeos::NetworkHandler::Get()->managed_network_configuration_handler())
-      .release();
+  CertDatabaseService* cert_service =
+      CertDatabaseServiceFactory::GetForBrowserContext(context);
+
+  UserNetworkConfigurationUpdater* updater =
+      UserNetworkConfigurationUpdater::CreateForUserPolicy(
+          profile,
+          allow_trusted_certs_from_policy,
+          *user,
+          profile_connector->policy_service(),
+          chromeos::NetworkHandler::Get()
+              ->managed_network_configuration_handler()).release();
+
+  cert_service->GetNSSCertDatabase(base::Bind(
+      &UserNetworkConfigurationUpdater::CreateAndSetCertificateImporter,
+      base::Unretained(updater)));

[mattm, 2014/09/05 07:35:28]

Is Unretained safe here?  Are ownership/lifetime issues fair game or part of the
details you were saving for later? (Just wondering how hard I should think about
this)

[pneubeck (no reviews), 2014/09/05 08:04:56]

Yes, this one isn't thought through yet.
I'll add a HUGE comment here.

[pneubeck (no reviews), 2014/09/12 16:20:23]

This is fixed now.

+
+  return updater;
 }
 
 }  // namespace policy