[Sync] Adjust new entity version before commit.

sync/engine/worker_entity_tracker.cc

 // 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.
 
 #include "sync/engine/worker_entity_tracker.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 13 matching lines @@
       base_version_(kUncommittedVersion) {
   DCHECK(!client_tag_hash_.empty());
 }
 
 WorkerEntityTracker::~WorkerEntityTracker() {}
 
 bool WorkerEntityTracker::HasPendingCommit() const {
   return !!pending_commit_;
 }
 
-void WorkerEntityTracker::PrepareCommitProto(sync_pb::SyncEntity* commit_entity,
-                                             int64_t* sequence_number) const {
+void WorkerEntityTracker::PopulateCommitProto(
+    sync_pb::SyncEntity* commit_entity,
+    int64_t* sequence_number) const {
   DCHECK(HasPendingCommit());
   DCHECK(!client_tag_hash_.empty());
 
   if (!id_.empty()) {
     commit_entity->set_id_string(id_);
   }
 
   const EntityData& entity = pending_commit_->entity.value();
   DCHECK_EQ(client_tag_hash_, entity.client_tag_hash);
 
@@ skipping 148 matching lines @@
 
 bool WorkerEntityTracker::IsServerKnown() const {
   return base_version_ != kUncommittedVersion;
 }
 
 void WorkerEntityTracker::ClearPendingCommit() {
   pending_commit_.reset();
 }
 
 }  // namespace syncer_v2