[Sync] Adjust new entity version before commit.

sync/engine/worker_entity_tracker.h

 // Copyright 2014 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_WORKER_ENTITY_TRACKER_H_
 #define SYNC_ENGINE_WORKER_ENTITY_TRACKER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 27 matching lines @@
   WorkerEntityTracker(const std::string& id,
                       const std::string& client_tag_hash);
 
   ~WorkerEntityTracker();
 
   // Returns true if this entity should be commited to the server.
   bool HasPendingCommit() const;
 
   // Populates a sync_pb::SyncEntity for a commit.  Also sets the
   // |sequence_number|, so we can track it throughout the commit process.
-  void PrepareCommitProto(sync_pb::SyncEntity* commit_entity,
-                          int64_t* sequence_number) const;
+  void PopulateCommitProto(sync_pb::SyncEntity* commit_entity,
+                           int64_t* sequence_number) const;
 
   // Updates this entity with data from the latest version that the
   // model asked us to commit.  May clobber state related to the
   // model's previous commit attempt(s).
   void RequestCommit(const CommitRequestData& data);
 
   // Handles the receipt of a commit response.
   //
   // Since commits happen entirely on the sync thread, we can safely assume
   // that our item's state at the end of the commit is the same as it was at
@@ skipping 59 matching lines @@
   // of an pending update prevents commits.  As of this writing, the only
   // source of pending updates is updates that can't currently be decrypted.
   std::unique_ptr<UpdateResponseData> encrypted_update_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkerEntityTracker);
 };
 
 }  // namespace syncer_v2
 
 #endif  // SYNC_ENGINE_WORKER_ENTITY_TRACKER_H_