sync: Merge {Verify,Process}UpdatesCommand

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>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/synchronization/lock.h"
 #include "sync/engine/conflict_resolver.h"
 #include "sync/engine/syncer_types.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/util/extensions_activity_monitor.h"
 
 namespace syncer {
 
 namespace syncable {
 class Entry;
 class MutableEntry;
 }  // namespace syncable
 
 enum SyncerStep {
   SYNCER_BEGIN,
   DOWNLOAD_UPDATES,
-  VERIFY_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
@@ 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 syncer
 
 #endif  // SYNC_ENGINE_SYNCER_H_