Remove NSSCryptoModuleDelegate.

chrome/browser/ui/crypto_module_delegate_nss.cc

Index: chrome/browser/ui/crypto_module_delegate_nss.cc
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.cc b/chrome/browser/ui/crypto_module_delegate_nss.cc
index 7211e8a157b00fe5c4571f72066effd70b70ebdf..a29638008d8c97787fad962dacf032a3a998f274 100644
--- a/chrome/browser/ui/crypto_module_delegate_nss.cc
+++ b/chrome/browser/ui/crypto_module_delegate_nss.cc
@@ -7,66 +7,21 @@
 #include <utility>
 
 #include "base/bind.h"
-#include "chrome/browser/net/nss_context.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
-namespace {
-
-void CreateWithSlot(
-    chrome::CryptoModulePasswordReason reason,
-    const net::HostPortPair& server,
-    const base::Callback<void(std::unique_ptr<ChromeNSSCryptoModuleDelegate>)>&
-        callback,
-    crypto::ScopedPK11Slot slot) {
-  if (!slot) {
-    callback.Run(std::unique_ptr<ChromeNSSCryptoModuleDelegate>());
-    return;
-  }
-  callback.Run(std::unique_ptr<ChromeNSSCryptoModuleDelegate>(
-      new ChromeNSSCryptoModuleDelegate(reason, server, std::move(slot))));
-}
-
-}  // namespace
-
 ChromeNSSCryptoModuleDelegate::ChromeNSSCryptoModuleDelegate(
     chrome::CryptoModulePasswordReason reason,
-    const net::HostPortPair& server,
-    crypto::ScopedPK11Slot slot)
+    const net::HostPortPair& server)
     : reason_(reason),
       server_(server),
       event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
              base::WaitableEvent::InitialState::NOT_SIGNALED),
-      cancelled_(false),
-      slot_(std::move(slot)) {}
+      cancelled_(false) {}
 
 ChromeNSSCryptoModuleDelegate::~ChromeNSSCryptoModuleDelegate() {}
 
-// static
-void ChromeNSSCryptoModuleDelegate::CreateForResourceContext(
-    chrome::CryptoModulePasswordReason reason,
-    const net::HostPortPair& server,
-    content::ResourceContext* context,
-    const base::Callback<void(std::unique_ptr<ChromeNSSCryptoModuleDelegate>)>&
-        callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(!callback.is_null());
-
-  base::Callback<void(crypto::ScopedPK11Slot)> get_slot_callback =
-      base::Bind(&CreateWithSlot, reason, server, callback);
-
-  crypto::ScopedPK11Slot slot =
-      GetPrivateNSSKeySlotForResourceContext(context, get_slot_callback);
-  if (slot)
-    get_slot_callback.Run(std::move(slot));
-}
-
-// TODO(mattm): allow choosing which slot to generate and store the key.
-crypto::ScopedPK11Slot ChromeNSSCryptoModuleDelegate::RequestSlot() {
-  return std::move(slot_);
-}
-
 std::string ChromeNSSCryptoModuleDelegate::RequestPassword(
     const std::string& slot_name,
     bool retry,
@@ -114,9 +69,5 @@ 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());
+  return new ChromeNSSCryptoModuleDelegate(reason, server);
 }