| Index: crypto/nss_util_internal.h
|
| diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h
|
| index f321343d9564904251dc5a25944266cba4af2855..17d618785a79de4ba6ee14f7c9056856e734caa8 100644
|
| --- a/crypto/nss_util_internal.h
|
| +++ b/crypto/nss_util_internal.h
|
| @@ -24,9 +24,8 @@ 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.
|
| -CRYPTO_EXPORT_PRIVATE ScopedPK11Slot
|
| - OpenSoftwareNSSDB(const base::FilePath& path,
|
| - const std::string& description);
|
| +CRYPTO_EXPORT ScopedPK11Slot OpenSoftwareNSSDB(const base::FilePath& path,
|
| + const std::string& description);
|
|
|
| #if !defined(OS_CHROMEOS)
|
| // Returns a reference to the default NSS key slot for storing persistent data.
|
| @@ -59,7 +58,7 @@ CRYPTO_EXPORT ScopedPK11Slot GetSystemNSSKeySlot(
|
| // 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.
|
| -CRYPTO_EXPORT_PRIVATE void SetSystemKeySlotForTesting(ScopedPK11Slot slot);
|
| +CRYPTO_EXPORT void SetSystemKeySlotForTesting(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.
|
| @@ -104,7 +103,7 @@ CRYPTO_EXPORT ScopedPK11Slot GetPrivateSlotForChromeOSUser(
|
|
|
| // Closes the NSS DB for |username_hash| that was previously opened by the
|
| // *Initialize*ForChromeOSUser functions.
|
| -CRYPTO_EXPORT_PRIVATE void CloseChromeOSUserForTesting(
|
| +CRYPTO_EXPORT void CloseChromeOSUserForTesting(
|
| const std::string& username_hash);
|
| #endif // defined(OS_CHROMEOS)
|
|
|
|
|