Finish decoupling sync and invalidations

components/invalidation/sync_system_resources.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.
 //
 // Simple system resources class that uses the current message loop
 // for scheduling.  Assumes the current message loop is already
 // running.
 
 #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/invalidator_state.h"
 #include "components/invalidation/state_writer.h"
 #include "google/cacheinvalidation/include/system-resources.h"
 #include "jingle/notifier/base/notifier_options.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 
 namespace syncer {
 
 class GCMNetworkChannelDelegate;
 
 class SyncLogger : public invalidation::Logger {
  public:
   SyncLogger();
 
   virtual ~SyncLogger();
@@ skipping 204 matching lines @@
   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  // COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_