FYI: Move conflict resolve + clean up afterwards

sync/sync.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
@@ skipping 92 matching lines @@
         'engine/net/server_connection_manager.cc',
         'engine/net/server_connection_manager.h',
         'engine/net/url_translator.cc',
         'engine/net/url_translator.h',
         'engine/nudge_source.cc',
         'engine/nudge_source.h',
         'engine/process_commit_response_command.cc',
         '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',
         'engine/sync_engine_event.h',
         'engine/sync_scheduler.cc',
         'engine/sync_scheduler.h',
         'engine/sync_scheduler_impl.cc',
         'engine/sync_scheduler_impl.h',
         'engine/syncer.cc',
         'engine/syncer.h',
@@ skipping 24 matching lines @@
         'js/sync_js_controller.h',
         'protocol/proto_enum_conversions.cc',
         'protocol/proto_enum_conversions.h',
         'protocol/proto_value_conversions.cc',
         'protocol/proto_value_conversions.h',
         'protocol/sync_protocol_error.cc',
         'protocol/sync_protocol_error.h',
         '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',
         'sessions/sync_session.h',
         'sessions/sync_session_context.cc',
         'sessions/sync_session_context.h',
         'syncable/base_transaction.cc',
         'syncable/base_transaction.h',
         'syncable/blob.h',
         'syncable/dir_open_result.h',
@@ skipping 259 matching lines @@
         'protocol/sync_proto.gyp:sync_proto',
         'sync',
       ],
       'sources': [
         'internal_api/public/base/invalidation_test_util.cc',
         'internal_api/public/base/invalidation_test_util.h',
         'internal_api/public/base/model_type_invalidation_map_test_util.cc',
         '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',
         'sessions/test_util.h',
         'syncable/syncable_mock.cc',
         'syncable/syncable_mock.h',
         'test/callback_counter.h',
         'test/engine/fake_model_worker.cc',
         'test/engine/fake_model_worker.h',
         'test/engine/fake_sync_scheduler.cc',
@@ skipping 163 matching lines @@
           'engine/syncer_proto_util_unittest.cc',
           'engine/syncer_unittest.cc',
           'engine/throttled_data_type_tracker_unittest.cc',
           'engine/traffic_recorder_unittest.cc',
           'js/js_arg_list_unittest.cc',
           'js/js_event_details_unittest.cc',
           'js/sync_js_controller_unittest.cc',
           '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',
           'syncable/model_type_unittest.cc',
           'syncable/nigori_util_unittest.cc',
           'syncable/syncable_enum_conversions_unittest.cc',
           'syncable/syncable_id_unittest.cc',
           'syncable/syncable_unittest.cc',
           'util/cryptographer_unittest.cc',
           'util/data_encryption_win_unittest.cc',
@@ skipping 266 matching lines @@
           'variables': {
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }