sync: Remove the remaining conflict sets code

chrome/browser/sync/engine/syncer.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 22 matching lines @@
   CLEANUP_DISABLED_TYPES,
   DOWNLOAD_UPDATES,
   PROCESS_CLIENT_COMMAND,
   VERIFY_UPDATES,
   PROCESS_UPDATES,
   STORE_TIMESTAMPS,
   APPLY_UPDATES,
   BUILD_COMMIT_REQUEST,
   POST_COMMIT_MESSAGE,
   PROCESS_COMMIT_RESPONSE,
-  BUILD_AND_PROCESS_CONFLICT_SETS,
   RESOLVE_CONFLICTS,
   APPLY_UPDATES_TO_RESOLVE_CONFLICTS,
   CLEAR_PRIVATE_DATA,  // TODO(tim): Rename 'private' to 'user'.
   SYNCER_END
 };
 
 // A Syncer provides a control interface for driving the individual steps
 // of the sync cycle.  Each cycle (hopefully) moves the client into closer
 // synchronization with the server.  The individual steps are modeled
 // as SyncerCommands, and the ordering of the steps is expressed using
@@ skipping 55 matching lines @@
 };
 
 // Utility function declarations.
 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);
 void ClearServerData(syncable::MutableEntry* entry);
 const char* SyncerStepToString(const SyncerStep);
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_