Move some sync/notifier to components/invalidation

components/invalidation/sync_invalidation_listener.h

Index: components/invalidation/sync_invalidation_listener.h
diff --git a/sync/notifier/sync_invalidation_listener.h b/components/invalidation/sync_invalidation_listener.h
similarity index 92%
rename from sync/notifier/sync_invalidation_listener.h
rename to components/invalidation/sync_invalidation_listener.h
index aa332fb74db8f77e0dcb7c4608505177d97558e5..47738d6a252d0ce060fcfe98dcb02c4077b7a76c 100644
--- a/sync/notifier/sync_invalidation_listener.h
+++ b/components/invalidation/sync_invalidation_listener.h
@@ -5,8 +5,8 @@
 // A simple wrapper around invalidation::InvalidationClient that
 // handles all the startup/shutdown details and hookups.
 
-#ifndef SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_
-#define SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_
+#ifndef COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
+#define COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_
 
 #include <string>
 
@@ -16,14 +16,14 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/state_writer.h"
+#include "components/invalidation/sync_system_resources.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
-#include "sync/base/sync_export.h"
+#include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/ack_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/invalidator_state.h"
-#include "sync/notifier/state_writer.h"
-#include "sync/notifier/sync_system_resources.h"
 #include "sync/notifier/unacked_invalidation_set.h"
 
 namespace buzz {
@@ -41,7 +41,7 @@ class RegistrationManager;
 
 // SyncInvalidationListener is not thread-safe and lives on the sync
 // thread.
-class SYNC_EXPORT_PRIVATE SyncInvalidationListener
+class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
     : public NON_EXPORTED_BASE(invalidation::InvalidationListener),
       public StateWriter,
       public SyncNetworkChannel::Observer,
@@ -55,7 +55,7 @@ class SYNC_EXPORT_PRIVATE SyncInvalidationListener
       const invalidation::string&,
       invalidation::InvalidationListener*)> CreateInvalidationClientCallback;
 
-  class SYNC_EXPORT_PRIVATE Delegate {
+  class INVALIDATION_EXPORT_PRIVATE Delegate {
    public:
     virtual ~Delegate();
 
@@ -193,4 +193,4 @@ class SYNC_EXPORT_PRIVATE SyncInvalidationListener
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_
+#endif  // COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_