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

components/sync/BUILD.gn

Index: components/sync/BUILD.gn
diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn
index 91d8904f903190fc4152d1b49a6aecf0357fb8a1..e3caf494d5a6e7e8658f31296706a41042c69011 100644
--- a/components/sync/BUILD.gn
+++ b/components/sync/BUILD.gn
@@ -332,6 +332,18 @@ static_library("sync") {
     "driver/user_selectable_sync_type.h",
     "engine/commit_queue.cc",
     "engine/commit_queue.h",
+    "engine/cycle/commit_counters.cc",
+    "engine/cycle/commit_counters.h",
+    "engine/cycle/model_neutral_state.cc",
+    "engine/cycle/model_neutral_state.h",
+    "engine/cycle/status_counters.cc",
+    "engine/cycle/status_counters.h",
+    "engine/cycle/sync_cycle_snapshot.cc",
+    "engine/cycle/sync_cycle_snapshot.h",
+    "engine/cycle/type_debug_info_observer.cc",
+    "engine/cycle/type_debug_info_observer.h",
+    "engine/cycle/update_counters.cc",
+    "engine/cycle/update_counters.h",
     "engine/events/clear_server_data_request_event.cc",
     "engine/events/clear_server_data_request_event.h",
     "engine/events/clear_server_data_response_event.cc",
@@ -382,6 +394,19 @@ static_library("sync") {
     "engine_impl/conflict_resolver.h",
     "engine_impl/conflict_util.cc",
     "engine_impl/conflict_util.h",
+    "engine_impl/cycle/data_type_tracker.cc",
+    "engine_impl/cycle/data_type_tracker.h",
+    "engine_impl/cycle/debug_info_getter.h",
+    "engine_impl/cycle/directory_type_debug_info_emitter.cc",
+    "engine_impl/cycle/directory_type_debug_info_emitter.h",
+    "engine_impl/cycle/nudge_tracker.cc",
+    "engine_impl/cycle/nudge_tracker.h",
+    "engine_impl/cycle/status_controller.cc",
+    "engine_impl/cycle/status_controller.h",
+    "engine_impl/cycle/sync_cycle.cc",
+    "engine_impl/cycle/sync_cycle.h",
+    "engine_impl/cycle/sync_cycle_context.cc",
+    "engine_impl/cycle/sync_cycle_context.h",
     "engine_impl/directory_commit_contribution.cc",
     "engine_impl/directory_commit_contribution.h",
     "engine_impl/directory_commit_contributor.cc",
@@ -446,31 +471,6 @@ static_library("sync") {
     "protocol/proto_value_conversions.h",
     "protocol/sync_protocol_error.cc",
     "protocol/sync_protocol_error.h",
-    "sessions/commit_counters.cc",
-    "sessions/commit_counters.h",
-    "sessions/model_neutral_state.cc",
-    "sessions/model_neutral_state.h",
-    "sessions/status_counters.cc",
-    "sessions/status_counters.h",
-    "sessions/sync_session_snapshot.cc",
-    "sessions/sync_session_snapshot.h",
-    "sessions/type_debug_info_observer.cc",
-    "sessions/type_debug_info_observer.h",
-    "sessions/update_counters.cc",
-    "sessions/update_counters.h",
-    "sessions_impl/data_type_tracker.cc",
-    "sessions_impl/data_type_tracker.h",
-    "sessions_impl/debug_info_getter.h",
-    "sessions_impl/directory_type_debug_info_emitter.cc",
-    "sessions_impl/directory_type_debug_info_emitter.h",
-    "sessions_impl/nudge_tracker.cc",
-    "sessions_impl/nudge_tracker.h",
-    "sessions_impl/status_controller.cc",
-    "sessions_impl/status_controller.h",
-    "sessions_impl/sync_session.cc",
-    "sessions_impl/sync_session.h",
-    "sessions_impl/sync_session_context.cc",
-    "sessions_impl/sync_session_context.h",
     "syncable/dir_open_result.h",
     "syncable/directory.cc",
     "syncable/directory.h",
@@ -607,10 +607,12 @@ static_library("test_support_sync_core") {
     "base/model_type_test_util.h",
     "base/test_unrecoverable_error_handler.cc",
     "base/test_unrecoverable_error_handler.h",
+    "engine_impl/cycle/mock_debug_info_getter.cc",
+    "engine_impl/cycle/mock_debug_info_getter.h",
+    "engine_impl/cycle/test_util.cc",
+    "engine_impl/cycle/test_util.h",
     "js/js_test_util.cc",
     "js/js_test_util.h",
-    "sessions_impl/test_util.cc",
-    "sessions_impl/test_util.h",
     "test/callback_counter.h",
     "test/directory_backing_store_corruption_testing.cc",
     "test/directory_backing_store_corruption_testing.h",
@@ -645,9 +647,6 @@ static_library("test_support_sync_core") {
     "test/null_directory_change_delegate.h",
     "test/null_transaction_observer.cc",
     "test/null_transaction_observer.h",
-    "test/sessions/mock_debug_info_getter.cc",
-    "test/sessions/mock_debug_info_getter.h",
-    "test/sessions/test_scoped_session_event_listener.h",
     "test/test_directory_backing_store.cc",
     "test/test_directory_backing_store.h",
     "test/test_transaction_observer.cc",
@@ -860,9 +859,12 @@ source_set("unit_tests") {
     "driver/system_encryptor_unittest.cc",
     "driver/ui_data_type_controller_unittest.cc",
     "driver/ui_model_type_controller_unittest.cc",
+    "engine/cycle/sync_cycle_snapshot_unittest.cc",
     "engine/model_safe_worker_unittest.cc",
     "engine_impl/apply_control_data_updates_unittest.cc",
     "engine_impl/backoff_delay_provider_unittest.cc",
+    "engine_impl/cycle/nudge_tracker_unittest.cc",
+    "engine_impl/cycle/status_controller_unittest.cc",
     "engine_impl/directory_commit_contribution_unittest.cc",
     "engine_impl/directory_update_handler_unittest.cc",
     "engine_impl/get_updates_processor_unittest.cc",
@@ -877,9 +879,6 @@ source_set("unit_tests") {
     "js/sync_js_controller_unittest.cc",
     "protocol/proto_enum_conversions_unittest.cc",
     "protocol/proto_value_conversions_unittest.cc",
-    "sessions/sync_session_snapshot_unittest.cc",
-    "sessions_impl/nudge_tracker_unittest.cc",
-    "sessions_impl/status_controller_unittest.cc",
     "syncable/directory_backing_store_unittest.cc",
     "syncable/directory_unittest.cc",
     "syncable/directory_unittest.h",