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 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 775 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' ],
         },
       ],
     }],
   ],
 }