Move some sync/notifier to components/invalidation

components/invalidation/sync_system_resources.h

 // Copyright 2012 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.
 //
 // Simple system resources class that uses the current message loop
 // 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>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #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 {
 
 class GCMNetworkChannelDelegate;
 
 class SyncLogger : public invalidation::Logger {
  public:
   SyncLogger();
 
   virtual ~SyncLogger();
@@ skipping 40 matching lines @@
 
   base::WeakPtrFactory<SyncInvalidationScheduler> weak_factory_;
 };
 
 // SyncNetworkChannel implements common tasks needed to interact with
 // invalidation library:
 //  - registering message and network status callbacks
 //  - 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 {
    public:
     // Called when network channel state changes. Possible states are:
     //  - INVALIDATIONS_ENABLED : connection is established and working
     //  - TRANSIENT_INVALIDATION_ERROR : no network, connection lost, etc.
     //  - INVALIDATION_CREDENTIALS_REJECTED : Issues with auth token
     virtual void OnNetworkChannelStateChanged(
         InvalidatorState invalidator_state) = 0;
@@ skipping 100 matching lines @@
 
   // Runs the given callback with the given value and deletes it.
   void RunAndDeleteReadKeyCallback(
       invalidation::ReadKeyCallback* callback, const std::string& value);
 
   StateWriter* state_writer_;
   invalidation::Scheduler* scheduler_;
   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,
                       StateWriter* state_writer);
 
   virtual ~SyncSystemResources();
 
   // invalidation::SystemResources implementation.
   virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
@@ skipping 12 matching lines @@
   scoped_ptr<SyncLogger> logger_;
   scoped_ptr<SyncInvalidationScheduler> internal_scheduler_;
   scoped_ptr<SyncInvalidationScheduler> listener_scheduler_;
   scoped_ptr<SyncStorage> storage_;
   // sync_network_channel_ is owned by SyncInvalidationListener.
   SyncNetworkChannel* sync_network_channel_;
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_SYNC_SYSTEM_RESOURCES_H_
+#endif  // COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_