FYI: Move conflict resolve + clean up afterwards

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 0d32ffb428af0cc19dffa7c8377394039f8425d5..b408d7362c249c242dd2a24b89e8452efa4a25e4 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -110,8 +110,6 @@
         'engine/process_commit_response_command.h',
         'engine/process_updates_command.cc',
         'engine/process_updates_command.h',
-        'engine/resolve_conflicts_command.cc',
-        'engine/resolve_conflicts_command.h',
         'engine/store_timestamps_command.cc',
         'engine/store_timestamps_command.h',
         'engine/sync_engine_event.cc',
@@ -156,8 +154,6 @@
         'sessions/debug_info_getter.h',
         'sessions/ordered_commit_set.cc',
         'sessions/ordered_commit_set.h',
-        'sessions/session_state.cc',
-        'sessions/session_state.h',
         'sessions/status_controller.cc',
         'sessions/status_controller.h',
         'sessions/sync_session.cc',
@@ -437,6 +433,8 @@
         'internal_api/public/base/model_type_invalidation_map_test_util.h',
         'internal_api/public/base/model_type_test_util.cc',
         'internal_api/public/base/model_type_test_util.h',
+        'internal_api/public/sessions/sync_source_info_unittest.cc',
+        'internal_api/public/sessions/sync_session_snapshot_unittest.cc',
         'js/js_test_util.cc',
         'js/js_test_util.h',
         'sessions/test_util.cc',
@@ -620,7 +618,6 @@
           'protocol/proto_enum_conversions_unittest.cc',
           'protocol/proto_value_conversions_unittest.cc',
           'sessions/ordered_commit_set_unittest.cc',
-          'sessions/session_state_unittest.cc',
           'sessions/status_controller_unittest.cc',
           'sessions/sync_session_unittest.cc',
           'syncable/directory_backing_store_unittest.cc',