Retry: Move some sync/notifier to components/invalidation

components/invalidation/sync_invalidation_listener.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.
 //
 // 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>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #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 {
 class XmppTaskParentInterface;
 }  // namespace buzz
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace syncer {
 
 class ObjectIdInvalidationMap;
 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,
       public AckHandler,
       public base::NonThreadSafe {
  public:
   typedef base::Callback<invalidation::InvalidationClient*(
       invalidation::SystemResources*,
       int,
       const invalidation::string&,
       const invalidation::string&,
       invalidation::InvalidationListener*)> CreateInvalidationClientCallback;
 
-  class SYNC_EXPORT_PRIVATE Delegate {
+  class INVALIDATION_EXPORT_PRIVATE Delegate {
    public:
     virtual ~Delegate();
 
     virtual void OnInvalidate(
         const ObjectIdInvalidationMap& invalidations) = 0;
 
     virtual void OnInvalidatorStateChange(InvalidatorState state) = 0;
   };
 
   explicit SyncInvalidationListener(
@@ skipping 117 matching lines @@
   InvalidatorState ticl_state_;
   InvalidatorState push_client_state_;
 
   base::WeakPtrFactory<SyncInvalidationListener> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncInvalidationListener);
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_
+#endif  // COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_