sync: Merge apply updates and resolve conflicts

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 64 matching lines @@
         'internal_api/public/util/report_unrecoverable_error_function.h',
         'internal_api/public/util/unrecoverable_error_handler.h',
         'internal_api/public/util/unrecoverable_error_info.h',
         'internal_api/public/util/unrecoverable_error_info.cc',
         'internal_api/public/util/weak_handle.cc',
         'internal_api/public/util/weak_handle.h',
         'engine/all_status.cc',
         'engine/all_status.h',
         'engine/apply_control_data_updates.cc',
         'engine/apply_control_data_updates.h',
-        'engine/apply_updates_command.cc',
-        'engine/apply_updates_command.h',
+        'engine/apply_updates_and_resolve_conflicts_command.cc',
+        'engine/apply_updates_and_resolve_conflicts_command.h',
         'engine/backoff_delay_provider.cc',
         'engine/backoff_delay_provider.h',
         'engine/build_commit_command.cc',
         'engine/build_commit_command.h',
         'engine/commit.cc',
         'engine/commit.h',
         'engine/conflict_resolver.cc',
         'engine/conflict_resolver.h',
         'engine/conflict_util.cc',
         'engine/conflict_util.h',
         'engine/download_updates_command.cc',
         'engine/download_updates_command.h',
         'engine/get_commit_ids_command.cc',
         'engine/get_commit_ids_command.h',
         'engine/model_changing_syncer_command.cc',
         'engine/model_changing_syncer_command.h',
         '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 469 matching lines @@
           '..',
         ],
         'sources': [
           'internal_api/public/base/enum_set_unittest.cc',
           'internal_api/public/base/model_type_invalidation_map_unittest.cc',
           'internal_api/public/base/node_ordinal_unittest.cc',
           'internal_api/public/base/ordinal_unittest.cc',
           'internal_api/public/engine/model_safe_worker_unittest.cc',
           'internal_api/public/util/immutable_unittest.cc',
           'engine/apply_control_data_updates_unittest.cc',
-          'engine/apply_updates_command_unittest.cc',
+          'engine/apply_updates_and_resolve_conflicts_command_unittest.cc',
           'engine/backoff_delay_provider_unittest.cc',
           'engine/build_commit_command_unittest.cc',
           'engine/download_updates_command_unittest.cc',
           'engine/model_changing_syncer_command_unittest.cc',
           'engine/process_commit_response_command_unittest.cc',
           'engine/process_updates_command_unittest.cc',
           'engine/sync_scheduler_unittest.cc',
           'engine/sync_scheduler_whitebox_unittest.cc',
           'engine/syncer_proto_util_unittest.cc',
           'engine/syncer_unittest.cc',
@@ skipping 285 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' ],
         },
       ],
     }],
   ],
 }