[Sync] Move sessions/ to engine/cycle/ and rename things to match.

components/sync/core/sync_manager.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.
 
 #ifndef COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
 #define COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 33 matching lines @@
 
 class BaseTransaction;
 class CancelationSignal;
 class DataTypeDebugInfoListener;
 class Encryptor;
 class ExtensionsActivity;
 class InternalComponentsFactory;
 class JsBackend;
 class JsEventHandler;
 class ProtocolEvent;
+class SyncCycleSnapshot;
 class SyncEncryptionHandler;
 class SyncScheduler;
 class TypeDebugInfoObserver;
 class UnrecoverableErrorHandler;
 struct Experiments;
 struct UserShare;
 
-namespace sessions {
-class SyncSessionSnapshot;
-}  // namespace sessions
-
 // Contains everything needed to talk to and identify a user account.
 struct SyncCredentials {
   SyncCredentials();
   SyncCredentials(const SyncCredentials& other);
   ~SyncCredentials();
 
   // Account_id of signed in account.
   std::string account_id;
 
   // The email associated with this account.
@@ skipping 100 matching lines @@
   };
 
   // An interface the embedding application implements to receive
   // notifications from the SyncManager.  Register an observer via
   // SyncManager::AddObserver.  All methods are called only on the
   // sync thread.
   class Observer {
    public:
     // A round-trip sync-cycle took place and the syncer has resolved any
     // conflicts that may have arisen.
-    virtual void OnSyncCycleCompleted(
-        const sessions::SyncSessionSnapshot& snapshot) = 0;
+    virtual void OnSyncCycleCompleted(const SyncCycleSnapshot& snapshot) = 0;
 
     // Called when the status of the connection to the sync server has
     // changed.
     virtual void OnConnectionStatusChange(ConnectionStatus status) = 0;
 
     // Called when initialization is complete to the point that SyncManager can
     // process changes. This does not necessarily mean authentication succeeded
     // or that the SyncManager is online.
     // IMPORTANT: Creating any type of transaction before receiving this
     // notification is illegal!
@@ skipping 204 matching lines @@
 
   // Updates Sync's tracking of whether the cookie jar has a mismatch with the
   // chrome account. See ClientConfigParams proto message for more info.
   // Note: this does not trigger a sync cycle. It just updates the sync context.
   virtual void OnCookieJarChanged(bool account_mismatch, bool empty_jar) = 0;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_