Remove default key slot from KeygenHandler.

net/base/keygen_handler.h

 // Copyright (c) 2011 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 NET_BASE_KEYGEN_HANDLER_H_
 #define NET_BASE_KEYGEN_HANDLER_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #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 {
 
 // This class handles keypair generation for generating client
 // certificates via the <keygen> tag.
 // <http://dev.w3.org/html5/spec/Overview.html#the-keygen-element>
 // <https://developer.mozilla.org/En/HTML/HTML_Extensions/KEYGEN_Tag>
 
 class NET_EXPORT KeygenHandler {
  public:
   // Creates a handler that will generate a key with the given key size and
   // incorporate the |challenge| into the Netscape SPKAC structure. The request
   // for the key originated from |url|.
   KeygenHandler(int key_size_in_bits,
                 const std::string& challenge,
                 const GURL& url);
   ~KeygenHandler();
 
   // Actually generates the key-pair and the cert request (SPKAC), and returns
   // a base64-encoded string suitable for use as the form value of <keygen>.
   std::string GenKeyAndSignChallenge();
 
   // Exposed only for unit tests.
   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:
   int key_size_in_bits_;  // key size in bits (usually 2048)
   std::string challenge_;  // challenge string sent by server
   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)
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_KEYGEN_HANDLER_H_