sync: Merge apply updates and resolve conflicts

sync/engine/syncer.h

 // 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.
 
 #ifndef SYNC_ENGINE_SYNCER_H_
 #define SYNC_ENGINE_SYNCER_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 13 matching lines @@
 class MutableEntry;
 }  // namespace syncable
 
 enum SyncerStep {
   SYNCER_BEGIN,
   DOWNLOAD_UPDATES,
   PROCESS_UPDATES,
   STORE_TIMESTAMPS,
   APPLY_UPDATES,
   COMMIT,
-  RESOLVE_CONFLICTS,
-  APPLY_UPDATES_TO_RESOLVE_CONFLICTS,
   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
 // the SyncerStep enum.
 //
 // A Syncer instance expects to run on a dedicated thread.  Calls
@@ skipping 49 matching lines @@
 };
 
 // Utility function declarations.
 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);
 void ClearServerData(syncable::MutableEntry* entry);
 const char* SyncerStepToString(const SyncerStep);
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_SYNCER_H_