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

components/sync/engine_impl/all_status.cc

 // Copyright (c) 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.
 
 #include "components/sync/engine_impl/all_status.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "components/sync/base/model_type.h"
@@ skipping 17 matching lines @@
   SyncStatus status = status_;
   status.encryption_conflicts = 0;
   status.hierarchy_conflicts = 0;
   status.server_conflicts = 0;
   status.committed_count = 0;
   return status;
 }
 
 SyncStatus AllStatus::CalcSyncing(const SyncCycleEvent& event) const {
   SyncStatus status = CreateBlankStatus();
-  const sessions::SyncSessionSnapshot& snapshot = event.snapshot;
+  const SyncCycleSnapshot& snapshot = event.snapshot;
   status.encryption_conflicts = snapshot.num_encryption_conflicts();
   status.hierarchy_conflicts = snapshot.num_hierarchy_conflicts();
   status.server_conflicts = snapshot.num_server_conflicts();
   status.committed_count =
       snapshot.model_neutral_state().num_successful_commits;
 
   if (event.what_happened == SyncCycleEvent::SYNC_CYCLE_BEGIN) {
     status.syncing = true;
   } else if (event.what_happened == SyncCycleEvent::SYNC_CYCLE_ENDED) {
     status.syncing = false;
   }
 
   status.num_entries_by_type = snapshot.num_entries_by_type();
   status.num_to_delete_entries_by_type =
       snapshot.num_to_delete_entries_by_type();
 
-  // Accumulate update count only once per session to avoid double-counting.
+  // Accumulate update count only once per cycle to avoid double-counting.
   if (event.what_happened == SyncCycleEvent::SYNC_CYCLE_ENDED) {
     status.updates_received +=
         snapshot.model_neutral_state().num_updates_downloaded_total;
     status.tombstone_updates_received +=
         snapshot.model_neutral_state().num_tombstone_updates_downloaded_total;
     status.reflected_updates_received +=
         snapshot.model_neutral_state().num_reflected_updates_downloaded_total;
     status.num_commits_total +=
         snapshot.model_neutral_state().num_successful_commits;
     status.num_local_overwrites_total +=
@@ skipping 118 matching lines @@
 ScopedStatusLock::ScopedStatusLock(AllStatus* allstatus)
     : allstatus_(allstatus) {
   allstatus->mutex_.Acquire();
 }
 
 ScopedStatusLock::~ScopedStatusLock() {
   allstatus_->mutex_.Release();
 }
 
 }  // namespace syncer