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

components/sync/engine_impl/cycle/status_controller.h

Index: components/sync/engine_impl/cycle/status_controller.h
diff --git a/components/sync/sessions_impl/status_controller.h b/components/sync/engine_impl/cycle/status_controller.h
similarity index 87%
rename from components/sync/sessions_impl/status_controller.h
rename to components/sync/engine_impl/cycle/status_controller.h
index 88de59137cd5aa4f941982ea08790b0d57833e91..ab695534602facf42b5d7ccdbcb49c250af6ddb5 100644
--- a/components/sync/sessions_impl/status_controller.h
+++ b/components/sync/engine_impl/cycle/status_controller.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // StatusController handles all counter and status related number crunching and
-// state tracking on behalf of a SyncSession.
+// state tracking on behalf of a SyncCycle.
 //
 // This object may be accessed from many different threads.  It will be accessed
 // most often from the syncer thread.  However, when update application is in
@@ -14,8 +14,8 @@
 // This object contains only global state.  None of its members are per model
 // type counters.
 
-#ifndef COMPONENTS_SYNC_SESSIONS_IMPL_STATUS_CONTROLLER_H_
-#define COMPONENTS_SYNC_SESSIONS_IMPL_STATUS_CONTROLLER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_STATUS_CONTROLLER_H_
+#define COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_STATUS_CONTROLLER_H_
 
 #include <map>
 #include <vector>
@@ -24,11 +24,10 @@
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
+#include "components/sync/engine/cycle/model_neutral_state.h"
 #include "components/sync/engine/model_safe_worker.h"
-#include "components/sync/sessions/model_neutral_state.h"
 
 namespace syncer {
-namespace sessions {
 
 class StatusController {
  public:
@@ -55,10 +54,10 @@ class StatusController {
   int num_server_overwrites() const;
   int num_local_overwrites() const;
 
-  // The time at which we started the first sync cycle in this session.
+  // The time at which we started the most recent sync cycle.
   base::Time sync_start_time() const { return sync_start_time_; }
 
-  // If a poll was performed in this session, the time at which it finished.
+  // If a poll was performed in this cycle, the time at which it finished.
   // Not set if no poll was performed.
   base::Time poll_finish_time() const { return poll_finish_time_; }
 
@@ -107,7 +106,6 @@ class StatusController {
   DISALLOW_COPY_AND_ASSIGN(StatusController);
 };
 
-}  // namespace sessions
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_SESSIONS_IMPL_STATUS_CONTROLLER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_IMPL_CYCLE_STATUS_CONTROLLER_H_