sync: Merge {Verify,Process}UpdatesCommand

sync/engine/process_updates_command.h

Index: sync/engine/process_updates_command.h
diff --git a/sync/engine/process_updates_command.h b/sync/engine/process_updates_command.h
index 7604d11535e6dc0b2507419fffdcdebc0bc38f34..9f89a63537755a01ae1599a69573a19bf6a3ac7d 100644
--- a/sync/engine/process_updates_command.h
+++ b/sync/engine/process_updates_command.h
@@ -21,14 +21,12 @@ class WriteTransaction;
 
 class Cryptographer;
 
-// A syncer command for processing updates.
+// A syncer command for verifying and processing updates.
 //
-// Preconditions - updates in the SyncerSesssion have been downloaded
-//                 and verified.
+// Preconditions - Updates in the SyncerSesssion have been downloaded.
 //
 // Postconditions - All of the verified SyncEntity data will be copied to
 //                  the server fields of the corresponding syncable entries.
-// TODO(tim): This should not be ModelChanging (bug 36592).
 class ProcessUpdatesCommand : public ModelChangingSyncerCommand {
  public:
   ProcessUpdatesCommand();
@@ -42,6 +40,11 @@ class ProcessUpdatesCommand : public ModelChangingSyncerCommand {
       sessions::SyncSession* session) OVERRIDE;
 
  private:
+  VerifyResult VerifyUpdate(
+      syncable::WriteTransaction* trans,
+      const sync_pb::SyncEntity& entry,
+      ModelTypeSet requested_types,
+      const ModelSafeRoutingInfo& routes);
   ServerUpdateProcessingResult ProcessUpdate(
       const sync_pb::SyncEntity& proto_update,
       const Cryptographer* cryptographer,