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

components/sync/engine_impl/directory_commit_contribution.cc

 // 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.
 
 #include "components/sync/engine_impl/directory_commit_contribution.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <set>
 
+#include "components/sync/engine/cycle/commit_counters.h"
 #include "components/sync/engine_impl/commit_util.h"
 #include "components/sync/engine_impl/get_commit_ids.h"
 #include "components/sync/engine_impl/syncer_util.h"
-#include "components/sync/sessions/commit_counters.h"
 #include "components/sync/syncable/model_neutral_mutable_entry.h"
 #include "components/sync/syncable/syncable_model_neutral_write_transaction.h"
 
 namespace syncer {
 
 using syncable::GET_BY_HANDLE;
 using syncable::SYNCER;
 
 DirectoryCommitContribution::~DirectoryCommitContribution() {
   DCHECK(!syncing_bits_set_);
@@ skipping 41 matching lines @@
             RepeatedPtrFieldBackInserter(commit_message->mutable_entries()));
   if (!context_.context().empty())
     commit_message->add_client_contexts()->Swap(&context_);
 
   CommitCounters* counters = debug_info_emitter_->GetMutableCommitCounters();
   counters->num_commits_attempted += entities_.size();
 }
 
 SyncerError DirectoryCommitContribution::ProcessCommitResponse(
     const sync_pb::ClientToServerResponse& response,
-    sessions::StatusController* status) {
+    StatusController* status) {
   DCHECK(syncing_bits_set_);
   const sync_pb::CommitResponse& commit_response = response.commit();
 
   int transient_error_commits = 0;
   int conflicting_commits = 0;
   int error_commits = 0;
   int successes = 0;
 
   std::set<syncable::Id> deleted_folders;
   {
@@ skipping 97 matching lines @@
     // complete but the Cleanup method is called anyways. It appears these are
     // unset on the assumption that the sync cycle must have finished properly,
     // although that's actually up to the commit response handling logic.
     entry.PutDirtySync(false);
     entry.PutSyncing(false);
   }
   syncing_bits_set_ = false;
 }
 
 }  // namespace syncer