Relieve SyncerSession,SyncCycleState, SyncProcessState, SyncerSession, Syncer...

chrome/chrome.gyp

Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp	(revision 32594)
+++ chrome/chrome.gyp	(working copy)
@@ -5494,6 +5494,8 @@
         'browser/sync/engine/syncer_unittest.cc',
         'browser/sync/engine/syncproto_unittest.cc',
         'browser/sync/notifier/listener/talk_mediator_unittest.cc',
+        'browser/sync/sessions/status_controller_unittest.cc',
+        'browser/sync/sessions/sync_session_unittest.cc',
         'browser/sync/syncable/syncable_id_unittest.cc',
         'browser/sync/syncable/syncable_unittest.cc',
         'browser/sync/util/character_set_converters_unittest.cc',
@@ -5581,9 +5583,6 @@
         'browser/sync/engine/build_commit_command.h',
         'browser/sync/engine/change_reorder_buffer.cc',
         'browser/sync/engine/change_reorder_buffer.h',
-        'browser/sync/engine/client_command_channel.h',
-        'browser/sync/engine/conflict_resolution_view.cc',
-        'browser/sync/engine/conflict_resolution_view.h',
         'browser/sync/engine/conflict_resolver.cc',
         'browser/sync/engine/conflict_resolver.h',
         'browser/sync/engine/download_updates_command.cc',
@@ -5610,9 +5609,6 @@
         'browser/sync/engine/process_updates_command.h',
         'browser/sync/engine/resolve_conflicts_command.cc',
         'browser/sync/engine/resolve_conflicts_command.h',
-        'browser/sync/engine/sync_cycle_state.h',
-        'browser/sync/engine/sync_process_state.cc',
-        'browser/sync/engine/sync_process_state.h',
         'browser/sync/engine/syncapi.h',
         'browser/sync/engine/syncer.cc',
         'browser/sync/engine/syncer.h',
@@ -5622,13 +5618,8 @@
         'browser/sync/engine/syncer_end_command.h',
         'browser/sync/engine/syncer_proto_util.cc',
         'browser/sync/engine/syncer_proto_util.h',
-        'browser/sync/engine/syncer_session.h',
-        'browser/sync/engine/syncer_status.cc',
-        'browser/sync/engine/syncer_status.h',
         'browser/sync/engine/syncer_thread.cc',
         'browser/sync/engine/syncer_thread.h',
-        'browser/sync/engine/syncer_thread_timed_stop.cc',
-        'browser/sync/engine/syncer_thread_timed_stop.h',
         'browser/sync/engine/syncer_types.h',
         'browser/sync/engine/syncer_util.cc',
         'browser/sync/engine/syncer_util.h',
@@ -5638,6 +5629,13 @@
         'browser/sync/engine/verify_updates_command.cc',
         'browser/sync/engine/verify_updates_command.h',
         'browser/sync/protocol/service_constants.h',
+        'browser/sync/sessions/session_state.cc',
+        'browser/sync/sessions/session_state.h',
+        'browser/sync/sessions/status_controller.cc',
+        'browser/sync/sessions/status_controller.h',
+        'browser/sync/sessions/sync_session.cc',
+        'browser/sync/sessions/sync_session.h',
+        'browser/sync/sessions/sync_session_context.h',
         'browser/sync/syncable/blob.h',
         'browser/sync/syncable/dir_open_result.h',
         'browser/sync/syncable/directory_backing_store.cc',