| Index: crypto/nss_util_internal.h
|
| diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h
|
| index 0982a6e8c74c97fa012ebb1ac521db7e009be097..697e376e5a587ceeb8f4137b8dbb2d2ea0b923e1 100644
|
| --- a/crypto/nss_util_internal.h
|
| +++ b/crypto/nss_util_internal.h
|
| @@ -24,7 +24,7 @@ namespace crypto {
|
|
|
| // Opens an NSS software database in folder |path|, with the (potentially)
|
| // user-visible description |description|. Returns the slot for the opened
|
| -// database, or NULL if the database could not be opened.
|
| +// database, or nullptr if the database could not be opened.
|
| CRYPTO_EXPORT ScopedPK11Slot OpenSoftwareNSSDB(const base::FilePath& path,
|
| const std::string& description);
|
|
|
| @@ -57,8 +57,8 @@ CRYPTO_EXPORT ScopedPK11Slot GetSystemNSSKeySlot(
|
| // through |GetSystemNSSKeySlot| and |IsTPMTokenReady| will return true.
|
| // |InitializeTPMTokenAndSystemSlot|, which triggers the TPM initialization,
|
| // does not have to be called if the test system slot is set.
|
| -// This must must not be called consecutively with a |slot| != NULL. If |slot|
|
| -// is NULL, the test system slot is unset.
|
| +// This must must not be called consecutively with a |slot| != nullptr. If
|
| +// |slot| is nullptr, the test system slot is unset.
|
| CRYPTO_EXPORT void SetSystemKeySlotForTesting(ScopedPK11Slot slot);
|
|
|
| // Prepare per-user NSS slot mapping. It is safe to call this function multiple
|
|
|