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

components/sync/engine_impl/update_applicator.h

 // 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.
 //
 // An UpdateApplicator is used to iterate over a number of unapplied updates,
-// applying them to the client using the given syncer session.
+// applying them to the client using the given syncer cycle.
 //
 // UpdateApplicator might resemble an iterator, but it actually keeps retrying
 // failed updates until no remaining updates can be successfully applied.
 
 #ifndef COMPONENTS_SYNC_ENGINE_IMPL_UPDATE_APPLICATOR_H_
 #define COMPONENTS_SYNC_ENGINE_IMPL_UPDATE_APPLICATOR_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/sync/engine/model_safe_worker.h"
-#include "components/sync/sessions_impl/status_controller.h"
+#include "components/sync/engine_impl/cycle/status_controller.h"

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

I don't think this is used in this file, but seems to cause compile build errors
if I remove it. I think you should probably move this to the actually required
files instead.

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

Removed and added to components/sync/engine_impl/directory_update_handler.cc
instead, thanks!

 #include "components/sync/syncable/syncable_id.h"
 
 namespace syncer {
 
-namespace sessions {
+class ConflictResolver;

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

Where is this used? Remove?

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

Done.

+class Cryptographer;
 class StatusController;

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

This is also getting #included, definitely don't need to forward declare it.

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

Done.

-}
 
 namespace syncable {
 class WriteTransaction;
 class Entry;
 }
 
-class ConflictResolver;
-class Cryptographer;
-
 class UpdateApplicator {
  public:
   explicit UpdateApplicator(Cryptographer* cryptographer);
   ~UpdateApplicator();
 
   // Attempt to apply the specified updates.
   void AttemptApplications(syncable::WriteTransaction* trans,
                            const std::vector<int64_t>& handles);
 
   int updates_applied() { return updates_applied_; }
@@ skipping 17 matching lines @@
   int encryption_conflicts_;
   int hierarchy_conflicts_;
   std::set<syncable::Id> simple_conflict_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateApplicator);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_IMPL_UPDATE_APPLICATOR_H_