Initialize per-ChromeOS-user NSS slots and provide the functions to access them.

crypto/nss_util.h

Index: crypto/nss_util.h
diff --git a/crypto/nss_util.h b/crypto/nss_util.h
index efc8140f37fe39fe46989d34d22919e6991fa554..2fe4c05357bb00afe3e23eec3c325ddcf0ab187a 100644
--- a/crypto/nss_util.h
+++ b/crypto/nss_util.h
@@ -7,6 +7,8 @@
 
 #include <string>
 #include "base/basictypes.h"
+#include "base/callback_forward.h"
+#include "base/compiler_specific.h"
 #include "crypto/crypto_export.h"
 
 namespace base {
@@ -102,11 +104,18 @@ CRYPTO_EXPORT void OpenPersistentNSSDB();
 // GetPrivateNSSKeySlot() will return the TPM slot if one was found.
 CRYPTO_EXPORT void EnableTPMTokenForNSS();
 
+// Returns true if EnableTPMTokenForNSS has been called.
+CRYPTO_EXPORT bool IsTPMTokenEnabledForNSS() WARN_UNUSED_RESULT;

[Ryan Sleevi, 2013/12/04 20:59:55]

same comments: Why W_U_R?

[mattm, 2013/12/04 22:09:28]

Done.

+
 // Returns true if the TPM is owned and PKCS#11 initialized with the
 // user and security officer PINs, and has been enabled in NSS by
 // calling EnableTPMForNSS, and Chaps has been successfully
 // loaded into NSS.
-CRYPTO_EXPORT bool IsTPMTokenReady();
+// If |callback| is non-null and the function returns false, the |callback| will
+// be run once the TPM is ready. |callback| will never be run if the function
+// returns true.
+CRYPTO_EXPORT bool IsTPMTokenReady(const base::Closure& callback)
+    WARN_UNUSED_RESULT;
 
 // Initialize the TPM token.  Does nothing if it is already initialized.
 CRYPTO_EXPORT bool InitializeTPMToken(int token_slot_id);