sync: Merge apply updates and resolve conflicts

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 0d32ffb428af0cc19dffa7c8377394039f8425d5..be35db29e5dfb8f1afc46c23ee39991301e72b7f 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -82,8 +82,8 @@
         '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',
@@ -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',
@@ -601,7 +599,7 @@
           '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',