Index: crypto/nss_util_internal.h |
diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h |
index beb93c3d7d3101650cbca5fb7073a5448222c7e6..9fe28f7775703db1f85e0c2b02cb9f9300d0c8cb 100644 |
--- a/crypto/nss_util_internal.h |
+++ b/crypto/nss_util_internal.h |
@@ -53,14 +53,21 @@ 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 |
+// Sets the test system slot. |
+// If |skip_tpm_initialization| is true, the TPM initialization that is usually |
+// triggered by InitializeTPMTokenAndSystemSlot is skipped and instead the |
+// |slot| is directly exposed through |GetSystemNSSKeySlot| and |
+// |IsTPMTokenReady| will return true. |
+// If |skip_tpm_initialization| is false, InitializeTPMTokenAndSystemSlot must |
+// be called afterwards. If then no system token is provided by the Chaps |
// module, then this test slot will be used and the initialization continues as |
Ryan Sleevi
2014/07/29 00:23:16
English-wise, this reads a little weird (namely "I
pneubeck (no reviews)
2014/07/29 16:00:15
Yes, the 'then' was a typo.
|
-// if Chaps had provided this test slot. In particular, |slot| will be exposed |
+// if Chaps had provided this test slot. Again, |slot| will be exposed |
// by |GetSystemNSSKeySlot| and |IsTPMTokenReady| will return true. |
// 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); |
+CRYPTO_EXPORT_PRIVATE void SetSystemKeySlotForTesting( |
+ bool skip_tpm_initialization, |
+ ScopedPK11Slot slot); |
// Prepare per-user NSS slot mapping. It is safe to call this function multiple |
// times. Returns true if the user was added, or false if it already existed. |