Move some sync/notifier to components/invalidation

components/invalidation/sync_system_resources.h

Index: components/invalidation/sync_system_resources.h
diff --git a/sync/notifier/sync_system_resources.h b/components/invalidation/sync_system_resources.h
similarity index 94%
rename from sync/notifier/sync_system_resources.h
rename to components/invalidation/sync_system_resources.h
index b618dc9c4fff19b19724cf8ef0340357424a9238..48ff5a81fc7ec7733d3f6fe64f24def589a9fc1e 100644
--- a/sync/notifier/sync_system_resources.h
+++ b/components/invalidation/sync_system_resources.h
@@ -6,8 +6,8 @@
 // for scheduling.  Assumes the current message loop is already
 // running.
 
-#ifndef SYNC_NOTIFIER_SYNC_SYSTEM_RESOURCES_H_
-#define SYNC_NOTIFIER_SYNC_SYSTEM_RESOURCES_H_
+#ifndef COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_
+#define COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_
 
 #include <set>
 #include <string>
@@ -19,11 +19,11 @@
 #include "base/message_loop/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/values.h"
+#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/state_writer.h"
 #include "google/cacheinvalidation/include/system-resources.h"
 #include "jingle/notifier/base/notifier_options.h"
-#include "sync/base/sync_export.h"
-#include "sync/notifier/invalidator_state.h"
-#include "sync/notifier/state_writer.h"
+#include "sync/internal_api/public/base/invalidator_state.h"
 
 namespace syncer {
 
@@ -84,7 +84,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 SYNC_EXPORT_PRIVATE SyncNetworkChannel
+class INVALIDATION_EXPORT_PRIVATE SyncNetworkChannel
     : public NON_EXPORTED_BASE(invalidation::NetworkChannel) {
  public:
   class Observer {
@@ -205,7 +205,7 @@ class SyncStorage : public invalidation::Storage {
   std::string cached_state_;
 };
 
-class SYNC_EXPORT_PRIVATE SyncSystemResources
+class INVALIDATION_EXPORT_PRIVATE SyncSystemResources
     : public NON_EXPORTED_BASE(invalidation::SystemResources) {
  public:
   SyncSystemResources(SyncNetworkChannel* sync_network_channel,
@@ -238,4 +238,4 @@ class SYNC_EXPORT_PRIVATE SyncSystemResources
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_SYNC_SYSTEM_RESOURCES_H_
+#endif  // COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_