summaryrefslogtreecommitdiffstats
path: root/crypto/nss_util_internal.h
diff options
context:
space:
mode:
authorxhwang <xhwang@chromium.org>2015-11-06 10:50:36 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-06 18:51:17 +0000
commit3e9ca563bb15ef8841a76bcdf29bc23193ee36a0 (patch)
treedfc015c88ef63ec3bf6e5989e9bdf2e690d0575c /crypto/nss_util_internal.h
parent325596d66015ad8c91842425d008b5b8e9c3602b (diff)
downloadchromium_src-3e9ca563bb15ef8841a76bcdf29bc23193ee36a0.zip
chromium_src-3e9ca563bb15ef8841a76bcdf29bc23193ee36a0.tar.gz
chromium_src-3e9ca563bb15ef8841a76bcdf29bc23193ee36a0.tar.bz2
Deprecate *_EXPORT_PRIVATE macros.
Replaced all *_EXPORT_PRIVATE macros with *_EXPORT except for /net, /sync and /storage. BUG=552248 TEST=No functionality change. Review URL: https://codereview.chromium.org/1413173005 Cr-Commit-Position: refs/heads/master@{#358362}
Diffstat (limited to 'crypto/nss_util_internal.h')
-rw-r--r--crypto/nss_util_internal.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h
index f321343..17d6187 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)