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

components/sync/engine_impl/conflict_resolver.h

Index: components/sync/engine_impl/conflict_resolver.h
diff --git a/components/sync/engine_impl/conflict_resolver.h b/components/sync/engine_impl/conflict_resolver.h
index be36b65ba0c9768a928eb3b64782a4cc68c1d4ca..a0b0f6e313ef96aec38ce9883f0c978f58130234 100644
--- a/components/sync/engine_impl/conflict_resolver.h
+++ b/components/sync/engine_impl/conflict_resolver.h
@@ -22,11 +22,8 @@ class WriteTransaction;
 }  // namespace syncable
 
 class Cryptographer;
-struct UpdateCounters;
-
-namespace sessions {
 class StatusController;
-}  // namespace sessions
+struct UpdateCounters;
 
 class ConflictResolver {
  public:
@@ -50,7 +47,7 @@ class ConflictResolver {
   void ResolveConflicts(syncable::WriteTransaction* trans,
                         const Cryptographer* cryptographer,
                         const std::set<syncable::Id>& simple_conflict_ids,
-                        sessions::StatusController* status,
+                        StatusController* status,
                         UpdateCounters* counters);
 
  private:
@@ -61,7 +58,7 @@ class ConflictResolver {
   void ProcessSimpleConflict(syncable::WriteTransaction* trans,
                              const syncable::Id& id,
                              const Cryptographer* cryptographer,
-                             sessions::StatusController* status,
+                             StatusController* status,
                              UpdateCounters* counters);
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);