Remove default key slot from KeygenHandler.

net/base/keygen_handler.h

Index: net/base/keygen_handler.h
diff --git a/net/base/keygen_handler.h b/net/base/keygen_handler.h
index 8262775505ceb3b7726c59ca85a8198f5cb0b0e3..caeddaf0d93120078ec22891dec5aa14112c983b 100644
--- a/net/base/keygen_handler.h
+++ b/net/base/keygen_handler.h
@@ -13,8 +13,12 @@
 #include "net/base/net_export.h"
 #include "url/gurl.h"
 
+#if defined(USE_NSS)
+#include "crypto/scoped_nss_types.h"

[pneubeck (no reviews), 2014/07/15 14:07:28]

hmpf. This leaks nss includes into content/shell which doesn't set the required
include folders.

If you have a better idea than a) splitting KeygenHandler into an abstract
interface and an implementation or b) putting NSS members into a forward
declared 'struct NSSDetails' which is defined in the _nss.cc (this also requires
to abandon the shared KeygenHandler constructor)
, I'd like to hear it.

+#endif
+
 namespace crypto {
-class NSSCryptoModuleDelegate;
+class CryptoModuleBlockingPasswordDelegate;
 }
 
 namespace net {
@@ -42,12 +46,14 @@ class NET_EXPORT KeygenHandler {
   void set_stores_key(bool store) { stores_key_ = store;}
 
 #if defined(USE_NSS)
+  void set_key_slot(PK11SlotInfo* slot);
+
   // Register the delegate to be used to get the token to store the key in, and
   // to get the password if the token is unauthenticated.
   // GenKeyAndSignChallenge runs on a worker thread, so using a blocking
   // password callback is okay here.
   void set_crypto_module_delegate(
-      scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate);
+      scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate> delegate);
 #endif  // defined(USE_NSS)
 
  private:
@@ -56,8 +62,10 @@ class NET_EXPORT KeygenHandler {
   GURL url_;  // the URL that requested the key
   bool stores_key_;  // should the generated key-pair be stored persistently?
 #if defined(USE_NSS)
+  crypto::ScopedPK11Slot slot_;
   // The callback for requesting a password to the PKCS#11 token.
-  scoped_ptr<crypto::NSSCryptoModuleDelegate> crypto_module_delegate_;
+  scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
+      crypto_module_delegate_;
 #endif  // defined(USE_NSS)
 };