Make crypto::GetSystemNSSKeySlot asynchronous.

crypto/nss_util_internal.h

Index: crypto/nss_util_internal.h
diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h
index c40295f71da21eb49d25d7f81294ca7c22863daf..d8ee0ae0b1b9ff2d3d26e281373abfee0954f3f8 100644
--- a/crypto/nss_util_internal.h
+++ b/crypto/nss_util_internal.h
@@ -47,9 +47,11 @@ class CRYPTO_EXPORT AutoSECMODListReadLock {
 };
 
 #if defined(OS_CHROMEOS)
-// Returns a reference to the system-wide TPM slot. Caller must release returned
-// reference with PK11_FreeSlot.
-CRYPTO_EXPORT PK11SlotInfo* GetSystemNSSKeySlot() WARN_UNUSED_RESULT;
+// Returns a reference to the system-wide TPM slot if it is loaded. If it is not
+// laoded and |callback| is non-null, the |callback| will be run once the slot

[mattm, 2014/07/29 23:16:46]

laoded

+// is loaded.
+CRYPTO_EXPORT ScopedPK11Slot GetSystemNSSKeySlot(
+    const base::Callback<void(ScopedPK11Slot)>& callback) WARN_UNUSED_RESULT;
 
 // Sets the test system slot. If this was called before
 // InitializeTPMTokenAndSystemSlot and no system token is provided by the Chaps