Remove default key slot from KeygenHandler.

chrome/browser/ui/crypto_module_delegate_nss.h

Index: chrome/browser/ui/crypto_module_delegate_nss.h
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.h b/chrome/browser/ui/crypto_module_delegate_nss.h
index f3b7c37e5b49ab9f02978b155024ec0a57034d8d..cab9ae229466ec03cc07200097777e61e50e922b 100644
--- a/chrome/browser/ui/crypto_module_delegate_nss.h
+++ b/chrome/browser/ui/crypto_module_delegate_nss.h
@@ -17,11 +17,10 @@ namespace content {
 class ResourceContext;
 }
 
-// Delegate to handle unlocking a slot or indicating which slot to store a key
-// in. When passing to NSS functions which take a wincx argument, use the value
-// returned from the wincx() method.
+// Delegate to handle unlocking a slot. When passing to NSS functions which take
+// a wincx argument, use the value returned from the wincx() method.
 class ChromeNSSCryptoModuleDelegate
-    : public crypto::NSSCryptoModuleDelegate {
+    : public crypto::CryptoModuleBlockingPasswordDelegate {
  public:
   // Create a ChromeNSSCryptoModuleDelegate. |reason| is used to select what
   // string to show the user, |server| is displayed to indicate which connection
@@ -31,18 +30,6 @@ class ChromeNSSCryptoModuleDelegate
 
   virtual ~ChromeNSSCryptoModuleDelegate();
 
-  // Must be called on IO thread. Returns true if the delegate is ready for use.
-  // Otherwise, if |initialization_complete_callback| is non-null, the
-  // initialization will proceed asynchronously and the callback will be run
-  // once the delegate is ready to use. In that case, the caller must ensure the
-  // delegate remains alive until the callback is run.
-  bool InitializeSlot(content::ResourceContext* context,
-                      const base::Closure& initialization_complete_callback)
-      WARN_UNUSED_RESULT;
-
-  // crypto::NSSCryptoModuleDelegate implementation.
-  virtual crypto::ScopedPK11Slot RequestSlot() OVERRIDE;
-
   // crypto::CryptoModuleBlockingPasswordDelegate implementation.
   virtual std::string RequestPassword(const std::string& slot_name,
                                       bool retry,
@@ -53,8 +40,6 @@ class ChromeNSSCryptoModuleDelegate
 
   void GotPassword(const std::string& password);
 
-  void DidGetSlot(const base::Closure& callback, crypto::ScopedPK11Slot slot);
-
   // Parameters displayed in the dialog.
   const chrome::CryptoModulePasswordReason reason_;
   net::HostPortPair server_;
@@ -66,9 +51,6 @@ class ChromeNSSCryptoModuleDelegate
   std::string password_;
   bool cancelled_;
 
-  // The slot which will be returned by RequestSlot.
-  crypto::ScopedPK11Slot slot_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeNSSCryptoModuleDelegate);
 };