Retry: Move some sync/notifier to components/invalidation

components/invalidation/non_blocking_invalidator.h

Index: components/invalidation/non_blocking_invalidator.h
diff --git a/sync/notifier/non_blocking_invalidator.h b/components/invalidation/non_blocking_invalidator.h
similarity index 90%
rename from sync/notifier/non_blocking_invalidator.h
rename to components/invalidation/non_blocking_invalidator.h
index d08dfb9560e43086b2bff0a0a87a10404ce5afcd..f396796a7a8ea9fbeb49800d4cf6380107e215eb 100644
--- a/sync/notifier/non_blocking_invalidator.h
+++ b/components/invalidation/non_blocking_invalidator.h
@@ -5,8 +5,8 @@
 // An implementation of SyncNotifier that wraps InvalidationNotifier
 // on its own thread.
 
-#ifndef SYNC_NOTIFIER_NON_BLOCKING_INVALIDATOR_H_
-#define SYNC_NOTIFIER_NON_BLOCKING_INVALIDATOR_H_
+#ifndef COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_
+#define COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_
 
 #include <string>
 
@@ -15,12 +15,12 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/invalidator_registrar.h"
 #include "jingle/notifier/base/notifier_options.h"
-#include "sync/base/sync_export.h"
+#include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/invalidator.h"
-#include "sync/notifier/invalidator_registrar.h"
-#include "sync/notifier/invalidator_state.h"
 #include "sync/notifier/unacked_invalidation_set.h"
 
 namespace base {
@@ -36,7 +36,7 @@ class GCMNetworkChannelDelegate;
 typedef base::Callback<scoped_ptr<SyncNetworkChannel>(void)>
     NetworkChannelCreator;
 
-class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
+class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
     : public Invalidator,
       public InvalidationStateTracker {
  public:
@@ -111,4 +111,4 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_NON_BLOCKING_INVALIDATOR_H_
+#endif  // COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_