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}

10 files changed, 14 insertions, 16 deletions

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_