Remove default key slot from KeygenHandler.

chrome/browser/ui/crypto_module_delegate_nss.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_CRYPTO_MODULE_DELEGATE_NSS_H_
 #define CHROME_BROWSER_UI_CRYPTO_MODULE_DELEGATE_NSS_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #include "crypto/nss_crypto_module_delegate.h"
 #include "net/base/host_port_pair.h"
 
 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
   // is causing the dialog to appear.
   ChromeNSSCryptoModuleDelegate(chrome::CryptoModulePasswordReason reason,
                                 const net::HostPortPair& server);
 
   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,
                                       bool* cancelled) OVERRIDE;
 
  private:
   void ShowDialog(const std::string& slot_name, bool retry);
 
   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_;
 
   // Event to block worker thread while waiting for dialog on UI thread.
   base::WaitableEvent event_;
 
   // Stores the results from the dialog for access on worker thread.
   std::string password_;
   bool cancelled_;
 
-  // The slot which will be returned by RequestSlot.
-  crypto::ScopedPK11Slot slot_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeNSSCryptoModuleDelegate);
 };
 
 // Create a delegate which only handles unlocking slots.
 crypto::CryptoModuleBlockingPasswordDelegate*
     CreateCryptoModuleBlockingPasswordDelegate(
         chrome::CryptoModulePasswordReason reason,
         const net::HostPortPair& server);
 
 #endif  // CHROME_BROWSER_UI_CRYPTO_MODULE_DELEGATE_NSS_H_