Move some sync/notifier to components/invalidation

components/invalidation/p2p_invalidator.h

Index: components/invalidation/p2p_invalidator.h
diff --git a/sync/notifier/p2p_invalidator.h b/components/invalidation/p2p_invalidator.h
similarity index 87%
rename from sync/notifier/p2p_invalidator.h
rename to components/invalidation/p2p_invalidator.h
index 07f46e72e28990a634c6434fabcad9dbffed8a65..e0d6070d885462fd1dda96e75abb0e91aea61a2f 100644
--- a/sync/notifier/p2p_invalidator.h
+++ b/components/invalidation/p2p_invalidator.h
@@ -5,8 +5,8 @@
 // An invalidator that uses p2p invalidations based on XMPP push
 // notifications.  Used only for sync integration tests.
 
-#ifndef SYNC_NOTIFIER_P2P_INVALIDATOR_H_
-#define SYNC_NOTIFIER_P2P_INVALIDATOR_H_
+#ifndef COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_
+#define COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_
 
 #include <string>
 
@@ -16,14 +16,14 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
+#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/invalidator_registrar.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "jingle/notifier/listener/push_client_observer.h"
-#include "sync/base/sync_export.h"
+#include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/notifier/invalidator.h"
-#include "sync/notifier/invalidator_registrar.h"
-#include "sync/notifier/invalidator_state.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 
 namespace notifier {
@@ -33,7 +33,7 @@ class PushClient;
 namespace syncer {
 
 // The channel to use for sync notifications.
-SYNC_EXPORT extern const char kSyncP2PNotificationChannel[];
+INVALIDATION_EXPORT extern const char kSyncP2PNotificationChannel[];
 
 // The intended recipient(s) of a P2P notification.
 enum P2PNotificationTarget {
@@ -44,16 +44,16 @@ enum P2PNotificationTarget {
   LAST_NOTIFICATION_TARGET = NOTIFY_ALL
 };
 
-SYNC_EXPORT_PRIVATE std::string P2PNotificationTargetToString(
+INVALIDATION_EXPORT_PRIVATE std::string P2PNotificationTargetToString(
     P2PNotificationTarget target);
 
 // If |target_str| can't be parsed, assumes NOTIFY_SELF.
-SYNC_EXPORT_PRIVATE P2PNotificationTarget P2PNotificationTargetFromString(
-    const std::string& target_str);
+INVALIDATION_EXPORT_PRIVATE P2PNotificationTarget
+P2PNotificationTargetFromString(const std::string& target_str);
 
 // Helper notification data class that can be serialized to and
 // deserialized from a string.
-class SYNC_EXPORT_PRIVATE P2PNotificationData {
+class INVALIDATION_EXPORT_PRIVATE P2PNotificationData {
  public:
   // Initializes with an empty sender ID, target set to NOTIFY_SELF,
   // and empty changed types.
@@ -86,7 +86,7 @@ class SYNC_EXPORT_PRIVATE P2PNotificationData {
   ObjectIdInvalidationMap invalidation_map_;
 };
 
-class SYNC_EXPORT_PRIVATE P2PInvalidator
+class INVALIDATION_EXPORT_PRIVATE P2PInvalidator
     : public Invalidator,
       public NON_EXPORTED_BASE(notifier::PushClientObserver) {
  public:
@@ -147,4 +147,4 @@ class SYNC_EXPORT_PRIVATE P2PInvalidator
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_P2P_INVALIDATOR_H_
+#endif  // COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_