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}

28 files changed, 38 insertions, 61 deletions

diff --git a/base/base_export.h b/base/base_export.h
index 723b38a..cf7ebd7 100644
--- a/base/base_export.h
+++ b/base/base_export.h
@@ -10,25 +10,20 @@
 
 #if defined(BASE_IMPLEMENTATION)
 #define BASE_EXPORT __declspec(dllexport)
-#define BASE_EXPORT_PRIVATE __declspec(dllexport)
 #else
 #define BASE_EXPORT __declspec(dllimport)
-#define BASE_EXPORT_PRIVATE __declspec(dllimport)
 #endif  // defined(BASE_IMPLEMENTATION)
 
 #else  // defined(WIN32)
 #if defined(BASE_IMPLEMENTATION)
 #define BASE_EXPORT __attribute__((visibility("default")))
-#define BASE_EXPORT_PRIVATE __attribute__((visibility("default")))
 #else
 #define BASE_EXPORT
-#define BASE_EXPORT_PRIVATE
 #endif  // defined(BASE_IMPLEMENTATION)
 #endif
 
 #else  // defined(COMPONENT_BUILD)
 #define BASE_EXPORT
-#define BASE_EXPORT_PRIVATE
 #endif
 
 #endif  // BASE_BASE_EXPORT_H_
diff --git a/base/json/json_parser.h b/base/json/json_parser.h
index 4e23beb..ac1ad85 100644
--- a/base/json/json_parser.h
+++ b/base/json/json_parser.h
@@ -40,7 +40,7 @@ class JSONParserTest;
 // of a token, such that the next iteration of the parser will be at the byte
 // immediately following the token, which would likely be the first byte of the
 // next token.
-class BASE_EXPORT_PRIVATE JSONParser {
+class BASE_EXPORT JSONParser {
  public:
   explicit JSONParser(int options);
   ~JSONParser();
diff --git a/base/metrics/bucket_ranges.h b/base/metrics/bucket_ranges.h
index 6ea5849..eb330f4 100644
--- a/base/metrics/bucket_ranges.h
+++ b/base/metrics/bucket_ranges.h
@@ -71,7 +71,7 @@ class BASE_EXPORT BucketRanges {
 
 //////////////////////////////////////////////////////////////////////////////
 // Expose only for test.
-BASE_EXPORT_PRIVATE extern const uint32 kCrcTable[256];
+BASE_EXPORT extern const uint32 kCrcTable[256];
 
 }  // namespace base
 
diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
index 1f6e2a1..15e0ec2 100644
--- a/base/metrics/histogram.h
+++ b/base/metrics/histogram.h
@@ -224,7 +224,7 @@ class BASE_EXPORT Histogram : public HistogramBase {
   friend class StatisticsRecorder;  // To allow it to delete duplicates.
   friend class StatisticsRecorderTest;
 
-  friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
+  friend BASE_EXPORT HistogramBase* DeserializeHistogramInfo(
       base::PickleIterator* iter);
   static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
 
@@ -349,7 +349,7 @@ class BASE_EXPORT LinearHistogram : public Histogram {
   bool PrintEmptyBucket(size_t index) const override;
 
  private:
-  friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
+  friend BASE_EXPORT HistogramBase* DeserializeHistogramInfo(
       base::PickleIterator* iter);
   static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
 
@@ -379,7 +379,7 @@ class BASE_EXPORT BooleanHistogram : public LinearHistogram {
  private:
   BooleanHistogram(const std::string& name, const BucketRanges* ranges);
 
-  friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
+  friend BASE_EXPORT HistogramBase* DeserializeHistogramInfo(
       base::PickleIterator* iter);
   static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
 
@@ -427,7 +427,7 @@ class BASE_EXPORT CustomHistogram : public Histogram {
   double GetBucketSize(Count current, size_t i) const override;
 
  private:
-  friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
+  friend BASE_EXPORT HistogramBase* DeserializeHistogramInfo(
       base::PickleIterator* iter);
   static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
 
diff --git a/base/metrics/histogram_base.h b/base/metrics/histogram_base.h
index 304e3e0..669d4ba 100644
--- a/base/metrics/histogram_base.h
+++ b/base/metrics/histogram_base.h
@@ -43,8 +43,7 @@ std::string HistogramTypeToString(HistogramType type);
 
 // Create or find existing histogram that matches the pickled info.
 // Returns NULL if the pickled data has problems.
-BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
-    base::PickleIterator* iter);
+BASE_EXPORT HistogramBase* DeserializeHistogramInfo(base::PickleIterator* iter);
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/base/metrics/sample_map.h b/base/metrics/sample_map.h
index 952d34a1..d1d7cd6 100644
--- a/base/metrics/sample_map.h
+++ b/base/metrics/sample_map.h
@@ -17,7 +17,7 @@
 
 namespace base {
 
-class BASE_EXPORT_PRIVATE SampleMap : public HistogramSamples {
+class BASE_EXPORT SampleMap : public HistogramSamples {
  public:
   SampleMap();
   ~SampleMap() override;
@@ -40,7 +40,7 @@ class BASE_EXPORT_PRIVATE SampleMap : public HistogramSamples {
   DISALLOW_COPY_AND_ASSIGN(SampleMap);
 };
 
-class BASE_EXPORT_PRIVATE SampleMapIterator : public SampleCountIterator {
+class BASE_EXPORT SampleMapIterator : public SampleCountIterator {
  public:
   typedef std::map<HistogramBase::Sample, HistogramBase::Count>
       SampleToCountMap;
diff --git a/base/metrics/sample_vector.h b/base/metrics/sample_vector.h
index 55f9b96..8cb2ab9 100644
--- a/base/metrics/sample_vector.h
+++ b/base/metrics/sample_vector.h
@@ -20,7 +20,7 @@ namespace base {
 
 class BucketRanges;
 
-class BASE_EXPORT_PRIVATE SampleVector : public HistogramSamples {
+class BASE_EXPORT SampleVector : public HistogramSamples {
  public:
   explicit SampleVector(const BucketRanges* bucket_ranges);
   ~SampleVector() override;
@@ -53,7 +53,7 @@ class BASE_EXPORT_PRIVATE SampleVector : public HistogramSamples {
   DISALLOW_COPY_AND_ASSIGN(SampleVector);
 };
 
-class BASE_EXPORT_PRIVATE SampleVectorIterator : public SampleCountIterator {
+class BASE_EXPORT SampleVectorIterator : public SampleCountIterator {
  public:
   SampleVectorIterator(const std::vector<HistogramBase::AtomicCount>* counts,
                        const BucketRanges* bucket_ranges);
diff --git a/base/metrics/sparse_histogram.h b/base/metrics/sparse_histogram.h
index 3abd080..241d975 100644
--- a/base/metrics/sparse_histogram.h
+++ b/base/metrics/sparse_histogram.h
@@ -28,7 +28,7 @@ namespace base {
 
 class HistogramSamples;
 
-class BASE_EXPORT_PRIVATE SparseHistogram : public HistogramBase {
+class BASE_EXPORT SparseHistogram : public HistogramBase {
  public:
   // If there's one with same name, return the existing one. If not, create a
   // new one.
@@ -57,7 +57,7 @@ class BASE_EXPORT_PRIVATE SparseHistogram : public HistogramBase {
   // Clients should always use FactoryGet to create SparseHistogram.
   explicit SparseHistogram(const std::string& name);
 
-  friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
+  friend BASE_EXPORT HistogramBase* DeserializeHistogramInfo(
       base::PickleIterator* iter);
   static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
 
diff --git a/components/invalidation/impl/gcm_network_channel.h b/components/invalidation/impl/gcm_network_channel.h
index 511088c..a68e35b 100644
--- a/components/invalidation/impl/gcm_network_channel.h
+++ b/components/invalidation/impl/gcm_network_channel.h
@@ -46,7 +46,7 @@ struct GCMNetworkChannelDiagnostic {
 
 // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes
 // messages through GCMService.
-class INVALIDATION_EXPORT_PRIVATE GCMNetworkChannel
+class INVALIDATION_EXPORT GCMNetworkChannel
     : public SyncNetworkChannel,
       public net::URLFetcherDelegate,
       public net::NetworkChangeNotifier::NetworkChangeObserver,
diff --git a/components/invalidation/impl/invalidation_notifier.h b/components/invalidation/impl/invalidation_notifier.h
index db53e92..17e27ce 100644
--- a/components/invalidation/impl/invalidation_notifier.h
+++ b/components/invalidation/impl/invalidation_notifier.h
@@ -34,7 +34,7 @@ class PushClient;
 namespace syncer {
 
 // This class must live on the IO thread.
-class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier
+class INVALIDATION_EXPORT InvalidationNotifier
     : public Invalidator,
       public SyncInvalidationListener::Delegate,
       public base::NonThreadSafe {
diff --git a/components/invalidation/impl/non_blocking_invalidator.h b/components/invalidation/impl/non_blocking_invalidator.h
index 22e7f4e..23d535a 100644
--- a/components/invalidation/impl/non_blocking_invalidator.h
+++ b/components/invalidation/impl/non_blocking_invalidator.h
@@ -36,7 +36,7 @@ class GCMNetworkChannelDelegate;
 typedef base::Callback<scoped_ptr<SyncNetworkChannel>(void)>
     NetworkChannelCreator;
 
-class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
+class INVALIDATION_EXPORT NonBlockingInvalidator
     : public Invalidator,
       public InvalidationStateTracker {
  public:
diff --git a/components/invalidation/impl/p2p_invalidator.h b/components/invalidation/impl/p2p_invalidator.h
index b7bc462..c8ae1b5 100644
--- a/components/invalidation/impl/p2p_invalidator.h
+++ b/components/invalidation/impl/p2p_invalidator.h
@@ -43,16 +43,16 @@ enum P2PNotificationTarget {
   LAST_NOTIFICATION_TARGET = NOTIFY_ALL
 };
 
-INVALIDATION_EXPORT_PRIVATE std::string P2PNotificationTargetToString(
+INVALIDATION_EXPORT std::string P2PNotificationTargetToString(
     P2PNotificationTarget target);
 
 // If |target_str| can't be parsed, assumes NOTIFY_SELF.
-INVALIDATION_EXPORT_PRIVATE P2PNotificationTarget
+INVALIDATION_EXPORT P2PNotificationTarget
 P2PNotificationTargetFromString(const std::string& target_str);
 
 // Helper notification data class that can be serialized to and
 // deserialized from a string.
-class INVALIDATION_EXPORT_PRIVATE P2PNotificationData {
+class INVALIDATION_EXPORT P2PNotificationData {
  public:
   // Initializes with an empty sender ID, target set to NOTIFY_SELF,
   // and empty changed types.
@@ -85,7 +85,7 @@ class INVALIDATION_EXPORT_PRIVATE P2PNotificationData {
   ObjectIdInvalidationMap invalidation_map_;
 };
 
-class INVALIDATION_EXPORT_PRIVATE P2PInvalidator
+class INVALIDATION_EXPORT P2PInvalidator
     : public Invalidator,
       public NON_EXPORTED_BASE(notifier::PushClientObserver) {
  public:
diff --git a/components/invalidation/impl/push_client_channel.h b/components/invalidation/impl/push_client_channel.h
index 85a2fd3..d47cc49 100644
--- a/components/invalidation/impl/push_client_channel.h
+++ b/components/invalidation/impl/push_client_channel.h
@@ -22,7 +22,7 @@ namespace syncer {
 
 // A PushClientChannel is an implementation of NetworkChannel that
 // routes messages through a PushClient.
-class INVALIDATION_EXPORT_PRIVATE PushClientChannel
+class INVALIDATION_EXPORT PushClientChannel
     : public SyncNetworkChannel,
       public NON_EXPORTED_BASE(notifier::PushClientObserver) {
  public:
diff --git a/components/invalidation/impl/registration_manager.h b/components/invalidation/impl/registration_manager.h
index 3e6913f..0a3a943 100644
--- a/components/invalidation/impl/registration_manager.h
+++ b/components/invalidation/impl/registration_manager.h
@@ -32,8 +32,7 @@ using ::invalidation::InvalidationListener;
 // implementations include the syncer thread (both versions) and XMPP
 // retries.  The most sophisticated one is URLRequestThrottler; making
 // that generic should work for everyone.
-class INVALIDATION_EXPORT_PRIVATE RegistrationManager
-    : public base::NonThreadSafe {
+class INVALIDATION_EXPORT RegistrationManager : public base::NonThreadSafe {
  public:
   // Constants for exponential backoff (used by tests).
   static const int kInitialRegistrationDelaySeconds;
diff --git a/components/invalidation/impl/state_writer.h b/components/invalidation/impl/state_writer.h
index cb02c41..269098e 100644
--- a/components/invalidation/impl/state_writer.h
+++ b/components/invalidation/impl/state_writer.h
@@ -13,7 +13,7 @@
 
 namespace syncer {
 
-class INVALIDATION_EXPORT_PRIVATE StateWriter {
+class INVALIDATION_EXPORT StateWriter {
  public:
   virtual ~StateWriter() {}
 
diff --git a/components/invalidation/impl/sync_invalidation_listener.h b/components/invalidation/impl/sync_invalidation_listener.h
index 697c1a7..ad93cad 100644
--- a/components/invalidation/impl/sync_invalidation_listener.h
+++ b/components/invalidation/impl/sync_invalidation_listener.h
@@ -40,7 +40,7 @@ class RegistrationManager;
 
 // SyncInvalidationListener is not thread-safe and lives on the sync
 // thread.
-class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
+class INVALIDATION_EXPORT SyncInvalidationListener
     : public NON_EXPORTED_BASE(invalidation::InvalidationListener),
       public StateWriter,
       public SyncNetworkChannel::Observer,
@@ -54,7 +54,7 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
       const invalidation::string&,
       invalidation::InvalidationListener*)> CreateInvalidationClientCallback;
 
-  class INVALIDATION_EXPORT_PRIVATE Delegate {
+  class INVALIDATION_EXPORT Delegate {
    public:
     virtual ~Delegate();
 
diff --git a/components/invalidation/impl/sync_system_resources.h b/components/invalidation/impl/sync_system_resources.h
index 5a6e8c9..5b4d119 100644
--- a/components/invalidation/impl/sync_system_resources.h
+++ b/components/invalidation/impl/sync_system_resources.h
@@ -85,7 +85,7 @@ class SyncInvalidationScheduler : public invalidation::Scheduler {
 //  - notifying observers about network channel state change
 // Implementation of particular network protocol should implement
 // SendMessage and call NotifyStateChange and DeliverIncomingMessage.
-class INVALIDATION_EXPORT_PRIVATE SyncNetworkChannel
+class INVALIDATION_EXPORT SyncNetworkChannel
     : public NON_EXPORTED_BASE(invalidation::NetworkChannel) {
  public:
   class Observer {
@@ -213,7 +213,7 @@ class SyncStorage : public invalidation::Storage {
   std::string cached_state_;
 };
 
-class INVALIDATION_EXPORT_PRIVATE SyncSystemResources
+class INVALIDATION_EXPORT SyncSystemResources
     : public NON_EXPORTED_BASE(invalidation::SystemResources) {
  public:
   SyncSystemResources(SyncNetworkChannel* sync_network_channel,
diff --git a/components/invalidation/public/invalidation_export.h b/components/invalidation/public/invalidation_export.h
index f41a06b..8b41308 100644
--- a/components/invalidation/public/invalidation_export.h
+++ b/components/invalidation/public/invalidation_export.h
@@ -16,6 +16,5 @@
 // For now, we provide dummy definitions of these tags.
 
 #define INVALIDATION_EXPORT
-#define INVALIDATION_EXPORT_PRIVATE
 
 #endif  // COMPONENTS_INVALIDATION_PUBLIC_INVALIDATION_EXPORT_H_
diff --git a/components/sessions/content/content_serialized_navigation_driver.h b/components/sessions/content/content_serialized_navigation_driver.h
index dafaee2..c0911d7 100644
--- a/components/sessions/content/content_serialized_navigation_driver.h
+++ b/components/sessions/content/content_serialized_navigation_driver.h
@@ -17,7 +17,7 @@ namespace sessions {
 
 // Provides an implementation of SerializedNavigationDriver that is backed by
 // content classes.
-class SESSIONS_EXPORT_PRIVATE ContentSerializedNavigationDriver
+class SESSIONS_EXPORT ContentSerializedNavigationDriver
     : public SerializedNavigationDriver {
  public:
   ~ContentSerializedNavigationDriver() override;
diff --git a/components/sessions/core/serialized_navigation_driver.h b/components/sessions/core/serialized_navigation_driver.h
index 767394ca..5fc261e 100644
--- a/components/sessions/core/serialized_navigation_driver.h
+++ b/components/sessions/core/serialized_navigation_driver.h
@@ -16,7 +16,7 @@ class SerializedNavigationEntry;
 // The SerializedNavigationDriver interface allows SerializedNavigationEntry to
 // obtain information from a singleton driver object. A concrete implementation
 // must be provided by the driver on each platform.
-class SESSIONS_EXPORT_PRIVATE SerializedNavigationDriver {
+class SESSIONS_EXPORT SerializedNavigationDriver {
  public:
   virtual ~SerializedNavigationDriver() {}
 
diff --git a/components/sessions/core/sessions_export.h b/components/sessions/core/sessions_export.h
index 4ba194d..cd5ade4 100644
--- a/components/sessions/core/sessions_export.h
+++ b/components/sessions/core/sessions_export.h
@@ -10,25 +10,20 @@
 
 #if defined(SESSIONS_IMPLEMENTATION)
 #define SESSIONS_EXPORT __declspec(dllexport)
-#define SESSIONS_EXPORT_PRIVATE __declspec(dllexport)
 #else
 #define SESSIONS_EXPORT __declspec(dllimport)
-#define SESSIONS_EXPORT_PRIVATE __declspec(dllimport)
 #endif  // defined(SESSIONS_IMPLEMENTATION)
 
 #else  // defined(WIN32)
 #if defined(SESSIONS_IMPLEMENTATION)
 #define SESSIONS_EXPORT __attribute__((visibility("default")))
-#define SESSIONS_EXPORT_PRIVATE __attribute__((visibility("default")))
 #else
 #define SESSIONS_EXPORT
-#define SESSIONS_EXPORT_PRIVATE
 #endif
 #endif
 
 #else  // defined(COMPONENT_BUILD)
 #define SESSIONS_EXPORT
-#define SESSIONS_EXPORT_PRIVATE
 #endif
 
 #endif  // COMPONENTS_SESSIONS_CORE_SESSIONS_EXPORT_H_
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();
diff --git a/sandbox/sandbox_export.h b/sandbox/sandbox_export.h
index 40a4036..35d6a1b 100644
--- a/sandbox/sandbox_export.h
+++ b/sandbox/sandbox_export.h
@@ -13,16 +13,13 @@
 
 #if defined(SANDBOX_IMPLEMENTATION)
 #define SANDBOX_EXPORT __attribute__((visibility("default")))
-#define SANDBOX_EXPORT_PRIVATE __attribute__((visibility("default")))
 #else
 #define SANDBOX_EXPORT
-#define SANDBOX_EXPORT_PRIVATE
 #endif  // defined(SANDBOX_IMPLEMENTATION)
 
 #else  // defined(COMPONENT_BUILD)
 
 #define SANDBOX_EXPORT
-#define SANDBOX_EXPORT_PRIVATE
 
 #endif  // defined(COMPONENT_BUILD)