Retry: Move some sync/notifier to components/invalidation

components/invalidation/non_blocking_invalidator.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // 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>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #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 {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace syncer {
 class SyncNetworkChannel;
 class GCMNetworkChannelDelegate;
 
 // Callback type for function that creates SyncNetworkChannel. This function
 // gets passed into NonBlockingInvalidator constructor.
 typedef base::Callback<scoped_ptr<SyncNetworkChannel>(void)>
     NetworkChannelCreator;
 
-class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
+class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator
     : public Invalidator,
       public InvalidationStateTracker {
  public:
   // |invalidation_state_tracker| must be initialized and must outlive |this|.
   NonBlockingInvalidator(
       NetworkChannelCreator network_channel_creator,
       const std::string& invalidator_client_id,
       const UnackedInvalidationsMap& saved_invalidations,
       const std::string& invalidation_bootstrap_data,
       InvalidationStateTracker* invalidation_state_tracker,
@@ skipping 54 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> parent_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   base::WeakPtrFactory<NonBlockingInvalidator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NonBlockingInvalidator);
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_NON_BLOCKING_INVALIDATOR_H_
+#endif  // COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_