Replace c/b/nss_context by a KeyedService.

chrome/browser/ui/crypto_module_delegate_nss.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/ui/crypto_module_delegate_nss.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
-#include "chrome/browser/net/nss_context.h"
+#include "base/callback.h"
+#include "components/cert_database/public/cert_database_service_io_part.h"
 #include "content/public/browser/browser_thread.h"
+#include "net/cert/nss_cert_database.h"
 
 using content::BrowserThread;
 
 namespace {
 
 void CreateWithSlot(chrome::CryptoModulePasswordReason reason,

[tbarzic, 2014/10/22 20:38:19]

nit: I'd rename this. Maybe to CreateWithPrivateSlot/CreateWithCertDatabase

[pneubeck (no reviews), 2014/10/24 12:51:37]

used NSSCertDB to distinguish it from the public function CreateForCertDatabase.

                     const net::HostPortPair& server,
                     const base::Callback<void(
                         scoped_ptr<ChromeNSSCryptoModuleDelegate>)>& callback,
-                    crypto::ScopedPK11Slot slot) {
+                    net::NSSCertDatabase* nss_cert_db) {
+  crypto::ScopedPK11Slot slot;
+  if (nss_cert_db)
+    slot = nss_cert_db->GetPrivateSlot();
   if (!slot) {
     callback.Run(scoped_ptr<ChromeNSSCryptoModuleDelegate>());
     return;
   }
   callback.Run(scoped_ptr<ChromeNSSCryptoModuleDelegate>(
       new ChromeNSSCryptoModuleDelegate(reason, server, slot.Pass())));
 }
 
 }  // namespace
 
 ChromeNSSCryptoModuleDelegate::ChromeNSSCryptoModuleDelegate(
     chrome::CryptoModulePasswordReason reason,
     const net::HostPortPair& server,
     crypto::ScopedPK11Slot slot)
     : reason_(reason),
       server_(server),
       event_(false, false),
       cancelled_(false),
       slot_(slot.Pass()) {
 }
 
 ChromeNSSCryptoModuleDelegate::~ChromeNSSCryptoModuleDelegate() {}
 
 // static
-void ChromeNSSCryptoModuleDelegate::CreateForResourceContext(
+void ChromeNSSCryptoModuleDelegate::CreateForCertDatabase(
     chrome::CryptoModulePasswordReason reason,
     const net::HostPortPair& server,
-    content::ResourceContext* context,
+    cert_database::CertDatabaseServiceIOPart* cert_db_io,
     const base::Callback<void(scoped_ptr<ChromeNSSCryptoModuleDelegate>)>&
         callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!callback.is_null());
 
-  base::Callback<void(crypto::ScopedPK11Slot)> get_slot_callback =
+  base::Callback<void(net::NSSCertDatabase*)> get_nssdb_callback =
       base::Bind(&CreateWithSlot, reason, server, callback);
 
-  crypto::ScopedPK11Slot slot =
-      GetPrivateNSSKeySlotForResourceContext(context, get_slot_callback);
-  if (slot)
-    get_slot_callback.Run(slot.Pass());
+  net::NSSCertDatabase* nssdb =
+      cert_db_io->GetNSSCertDatabase(get_nssdb_callback);
+  if (nssdb)
+    get_nssdb_callback.Run(nssdb);
 }
 
 // TODO(mattm): allow choosing which slot to generate and store the key.
 crypto::ScopedPK11Slot ChromeNSSCryptoModuleDelegate::RequestSlot() {
   return slot_.Pass();
 }
 
 std::string ChromeNSSCryptoModuleDelegate::RequestPassword(
     const std::string& slot_name,
     bool retry,
@@ skipping 42 matching lines @@
 crypto::CryptoModuleBlockingPasswordDelegate*
 CreateCryptoModuleBlockingPasswordDelegate(
     chrome::CryptoModulePasswordReason reason,
     const net::HostPortPair& server) {
   // Returns a ChromeNSSCryptoModuleDelegate without Pk11Slot. Since it is only
   // being used as a CryptoModuleBlockingDialogDelegate, using a slot handle is
   // unnecessary.
   return new ChromeNSSCryptoModuleDelegate(
       reason, server, crypto::ScopedPK11Slot());
 }