NSS: Unlock crypto devices when populating cert manager.

chrome/browser/ui/crypto_module_password_dialog.h

Index: chrome/browser/ui/crypto_module_password_dialog.h
diff --git a/chrome/browser/ui/crypto_module_password_dialog.h b/chrome/browser/ui/crypto_module_password_dialog.h
index a6d9052c9e14dce8649324f25df323e10987411e..e2b4e34ef8dc838cdc2f72f69bfead3febdd3813 100644
--- a/chrome/browser/ui/crypto_module_password_dialog.h
+++ b/chrome/browser/ui/crypto_module_password_dialog.h
@@ -7,8 +7,10 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
+#include "base/ref_counted.h"
 
 namespace base {
 class CryptoModuleBlockingPasswordDelegate;
@@ -16,6 +18,7 @@ class CryptoModuleBlockingPasswordDelegate;
 
 namespace net {
 class CryptoModule;
+typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;

[wtc, 2011/03/02 03:33:28]

I hope we can avoid repeating this typedef in multiple headers.  Not a big deal
though.

[mattm, 2011/03/05 02:16:32]

Yeah, it's a bit ugly.  Just a question of how far we want to go in forward
declaring things instead of including the headers..

 class X509Certificate;
 }
 
@@ -26,6 +29,7 @@ enum CryptoModulePasswordReason {
   kCryptoModulePasswordKeygen,
   kCryptoModulePasswordCertEnrollment,
   kCryptoModulePasswordClientAuth,
+  kCryptoModulePasswordCertManager,

[wtc, 2011/03/02 03:33:28]

Perhaps this and the associated string ID in the .grd file should be named
ListCerts rather than CertManager?

[mattm, 2011/03/05 02:16:32]

Done.

   kCryptoModulePasswordCertImport,
   kCryptoModulePasswordCertExport,
 };
@@ -52,10 +56,10 @@ base::CryptoModuleBlockingPasswordDelegate*
 // Asynchronously unlock |module|, if necessary.  |callback| is called when done
 // (regardless if module was successfully unlocked or not).  Should only be
 // called on UI thread.

[wtc, 2011/03/02 03:33:28]

Please update the comment.

[mattm, 2011/03/05 02:16:32]

Done.

-void UnlockSlotIfNecessary(net::CryptoModule* module,
-                           browser::CryptoModulePasswordReason reason,
-                           const std::string& server,
-                           Callback0::Type* callback);
+void UnlockSlotsIfNecessary(const net::CryptoModuleList& modules,
+                            browser::CryptoModulePasswordReason reason,
+                            const std::string& server,
+                            Callback0::Type* callback);
 
 // Asynchronously unlock the |cert|'s module, if necessary.  |callback| is
 // called when done (regardless if module was successfully unlocked or not).