sync: Remove the remaining conflict sets code

chrome/chrome.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,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 348 matching lines @@
     },
     {
       'target_name': 'sync',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'sources': [
         'browser/sync/engine/all_status.cc',
         'browser/sync/engine/all_status.h',
         'browser/sync/engine/apply_updates_command.cc',
         'browser/sync/engine/apply_updates_command.h',
-        'browser/sync/engine/build_and_process_conflict_sets_command.cc',
-        'browser/sync/engine/build_and_process_conflict_sets_command.h',
         'browser/sync/engine/build_commit_command.cc',
         'browser/sync/engine/build_commit_command.h',
         'browser/sync/engine/cleanup_disabled_types_command.cc',
         'browser/sync/engine/cleanup_disabled_types_command.h',
         'browser/sync/engine/clear_data_command.cc',
         'browser/sync/engine/clear_data_command.h',
         'browser/sync/engine/conflict_resolver.cc',
         'browser/sync/engine/conflict_resolver.h',
         'browser/sync/engine/download_updates_command.cc',
         'browser/sync/engine/download_updates_command.h',
@@ skipping 966 matching lines @@
           'sources': [
             'browser/safe_browsing/signature_util.h',
             'browser/safe_browsing/signature_util_win.cc',
             'tools/safe_browsing/sb_sigutil.cc',
           ],
         },
       ]},  # 'targets'
     ],  # OS=="win"
   ],  # 'conditions'
 }