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

components/sync/engine_impl/commit_util.cc

 // Copyright 2013 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/commit_util.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/debug/dump_without_crashing.h"
 #include "base/strings/string_util.h"
 #include "components/sync/base/attachment_id_proto.h"
 #include "components/sync/base/time.h"
 #include "components/sync/base/unique_position.h"
+#include "components/sync/engine_impl/cycle/sync_cycle.h"

[skym, 2016/08/19 17:17:42]

I don't think this import actually does anything, you should be able to remove.

[maxbogue, 2016/08/19 19:12:00]

Removed.

 #include "components/sync/engine_impl/syncer_proto_util.h"
 #include "components/sync/protocol/bookmark_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
-#include "components/sync/sessions_impl/sync_session.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/entry.h"
 #include "components/sync/syncable/model_neutral_mutable_entry.h"
 #include "components/sync/syncable/syncable_base_transaction.h"
 #include "components/sync/syncable/syncable_base_write_transaction.h"
 #include "components/sync/syncable/syncable_changes_version.h"
 #include "components/sync/syncable/syncable_proto_util.h"
 #include "components/sync/syncable/syncable_util.h"
 
 using std::set;
 using std::string;
 using std::vector;
 
 namespace syncer {
 
 using syncable::Entry;
 using syncable::Id;
 
 namespace commit_util {
 
 void AddExtensionsActivityToMessage(

[skym, 2016/08/19 17:17:42]

Was this like required for stars? And we can rip out all of this? Or is this
like a debugging feature that I just don't know how to use? (I'm mostly just
curious, way out of scope for this CL.)

[maxbogue, 2016/08/19 19:12:00]

I don't think it was for stars; looks like it was added in 2013 in
https://codereview.chromium.org/25638003.

     ExtensionsActivity* activity,
     ExtensionsActivity::Records* extensions_activity_buffer,
     sync_pb::CommitMessage* message) {
   // This isn't perfect, since the set of extensions activity may not correlate
   // exactly with the items being committed.  That's OK as long as we're looking
   // for a rough estimate of extensions activity, not an precise mapping of
   // which commits were triggered by which extension.
   //
   // We will push this list of extensions activity back into the
   // ExtensionsActivityMonitor if this commit fails.  That's why we must keep a
-  // copy of these records in the session.
+  // copy of these records in the cycle.
   activity->GetAndClearRecords(extensions_activity_buffer);
 
   const ExtensionsActivity::Records& records = *extensions_activity_buffer;
   for (ExtensionsActivity::Records::const_iterator it = records.begin();
        it != records.end(); ++it) {
     sync_pb::ChromiumExtensionsActivity* activity_message =
         message->add_extensions_activity();
     activity_message->set_extension_id(it->second.extension_id);
     activity_message->set_bookmark_writes_since_last_commit(
         it->second.bookmark_write_count);
@@ skipping 387 matching lines @@
 
   ProcessSuccessfulCommitResponse(commit_request_entry, server_entry,
                                   local_entry.GetId(), &local_entry,
                                   dirty_sync_was_set, deleted_folders);
   return response;
 }
 
 }  // namespace commit_util
 
 }  // namespace syncer