Enable system NSS key slot.

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 beb93c3d7d3101650cbca5fb7073a5448222c7e6..2c10636691323dfbbd953572d473b1d4b62e91c6 100644
--- a/crypto/nss_util_internal.h
+++ b/crypto/nss_util_internal.h
@@ -53,11 +53,10 @@ class CRYPTO_EXPORT AutoSECMODListReadLock {
 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
-// module, then this test slot will be used and the initialization continues as
-// if Chaps had provided this test slot. In particular, |slot| will be exposed
-// by |GetSystemNSSKeySlot| and |IsTPMTokenReady| will return true.
+// Sets the test system slot. |slot| is exposed through |GetSystemNSSKeySlot|
+// and |IsTPMTokenReady| will return true.
+// |InitializeTPMTokenAndSystemSlot|, which triggers the TPM initialization,
+// does not have to be called if the test slot is set.

[Ryan Sleevi, 2014/07/29 23:53:15]

Kind of a weird API contract, in that I'd think to actually test things are
working, you'd want the two to be different slots.

[pneubeck (no reviews), 2014/07/30 06:27:39]

No idea what 'two' slots you're meaning, only the system slot is affected here.
Maybe the comment is still misleading because of the inconsistent use of 'test
system slot', and 'test slot' which were meant to be the same?

Thus s/test slot/test system slot/

 // This must must not be called consecutively with a |slot| != NULL. If |slot|
 // is NULL, the test system slot is unset.
 CRYPTO_EXPORT_PRIVATE void SetSystemKeySlotForTesting(ScopedPK11Slot slot);