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}

6 files changed, 9 insertions, 16 deletions

diff --git a/crypto/crypto_export.h b/crypto/crypto_export.h
index 983afe6..605af94 100644
--- a/crypto/crypto_export.h
+++ b/crypto/crypto_export.h
@@ -6,33 +6,27 @@
 #define CRYPTO_CRYPTO_EXPORT_H_
 
 // Defines CRYPTO_EXPORT so that functionality implemented by the crypto module
-// can be exported to consumers, and CRYPTO_EXPORT_PRIVATE that allows unit
-// tests to access features not intended to be used directly by real consumers.
+// can be exported to consumers.
 
 #if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
 #if defined(CRYPTO_IMPLEMENTATION)
 #define CRYPTO_EXPORT __declspec(dllexport)
-#define CRYPTO_EXPORT_PRIVATE __declspec(dllexport)
 #else
 #define CRYPTO_EXPORT __declspec(dllimport)
-#define CRYPTO_EXPORT_PRIVATE __declspec(dllimport)
 #endif  // defined(CRYPTO_IMPLEMENTATION)
 
 #else  // defined(WIN32)
 #if defined(CRYPTO_IMPLEMENTATION)
 #define CRYPTO_EXPORT __attribute__((visibility("default")))
-#define CRYPTO_EXPORT_PRIVATE __attribute__((visibility("default")))
 #else
 #define CRYPTO_EXPORT
-#define CRYPTO_EXPORT_PRIVATE
 #endif
 #endif
 
 #else  // defined(COMPONENT_BUILD)
 #define CRYPTO_EXPORT
-#define CRYPTO_EXPORT_PRIVATE
 #endif
 
 #endif  // CRYPTO_CRYPTO_EXPORT_H_
diff --git a/crypto/ghash.h b/crypto/ghash.h
index 6dc247b..53f6b51 100644
--- a/crypto/ghash.h
+++ b/crypto/ghash.h
@@ -25,7 +25,7 @@ namespace crypto {
 //
 // WARNING: this code is not constant time. However, in all likelihood, nor is
 // the implementation of AES that is used.
-class CRYPTO_EXPORT_PRIVATE GaloisHash {
+class CRYPTO_EXPORT GaloisHash {
  public:
   explicit GaloisHash(const uint8 key[16]);
 
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)
 
diff --git a/crypto/scoped_test_nss_chromeos_user.h b/crypto/scoped_test_nss_chromeos_user.h
index 1638517..9202b0f 100644
--- a/crypto/scoped_test_nss_chromeos_user.h
+++ b/crypto/scoped_test_nss_chromeos_user.h
@@ -16,7 +16,7 @@ namespace crypto {
 // Opens a persistent NSS software database in a temporary directory for the
 // user with |username_hash|. This database will be used for both the user's
 // public and private slot.
-class CRYPTO_EXPORT_PRIVATE ScopedTestNSSChromeOSUser {
+class CRYPTO_EXPORT ScopedTestNSSChromeOSUser {
  public:
   // Opens the software database and sets the public slot for the user. The
   // private slot will not be initialized until FinishInit() is called.
diff --git a/crypto/scoped_test_nss_db.h b/crypto/scoped_test_nss_db.h
index 88c2d55..a305b7f 100644
--- a/crypto/scoped_test_nss_db.h
+++ b/crypto/scoped_test_nss_db.h
@@ -15,7 +15,7 @@ namespace crypto {
 // Opens a persistent NSS database in a temporary directory.
 // Prior NSS version 3.15.1, because of http://bugzil.la/875601 , the opened DB
 // will not be closed automatically.
-class CRYPTO_EXPORT_PRIVATE ScopedTestNSSDB {
+class CRYPTO_EXPORT ScopedTestNSSDB {
  public:
   ScopedTestNSSDB();
   ~ScopedTestNSSDB();
diff --git a/crypto/scoped_test_system_nss_key_slot.h b/crypto/scoped_test_system_nss_key_slot.h
index ac3b72c..99a269c 100644
--- a/crypto/scoped_test_system_nss_key_slot.h
+++ b/crypto/scoped_test_system_nss_key_slot.h
@@ -24,7 +24,7 @@ class ScopedTestNSSDB;
 // |InitializeTPMTokenAndSystemSlot|, which triggers the TPM initialization,
 // does not have to be called if this helper is used.
 // At most one instance of this helper must be used at a time.
-class CRYPTO_EXPORT_PRIVATE ScopedTestSystemNSSKeySlot {
+class CRYPTO_EXPORT ScopedTestSystemNSSKeySlot {
  public:
   explicit ScopedTestSystemNSSKeySlot();
   ~ScopedTestSystemNSSKeySlot();