[Sync] Adjust new entity version before commit.

sync/engine/worker_entity_tracker_unittest.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 <memory>
@@ skipping 79 matching lines @@
 // Construct a new entity from a commit request.  Then serialize it.
 TEST_F(WorkerEntityTrackerTest, FromCommitRequest) {
   const int64_t kSequenceNumber = 22;
   const int64_t kBaseVersion = 33;
   CommitRequestData data = MakeCommitRequestData(kSequenceNumber, kBaseVersion);
   entity_->RequestCommit(data);
 
   ASSERT_TRUE(entity_->HasPendingCommit());
   sync_pb::SyncEntity pb_entity;
   int64_t sequence_number = 0;
-  entity_->PrepareCommitProto(&pb_entity, &sequence_number);
+  entity_->PopulateCommitProto(&pb_entity, &sequence_number);
   EXPECT_EQ(kSequenceNumber, sequence_number);
   EXPECT_EQ(kServerId, pb_entity.id_string());
   EXPECT_EQ(kClientTagHash, pb_entity.client_defined_unique_tag());
   EXPECT_EQ(kBaseVersion, pb_entity.version());
   EXPECT_EQ(kCtime, syncer::ProtoTimeToTime(pb_entity.ctime()));
   EXPECT_EQ(kMtime, syncer::ProtoTimeToTime(pb_entity.mtime()));
   EXPECT_FALSE(pb_entity.deleted());
   EXPECT_EQ(specifics.preference().name(),
             pb_entity.specifics().preference().name());
   EXPECT_EQ(specifics.preference().value(),
@@ skipping 33 matching lines @@
   CommitRequestData data = MakeCommitRequestData(22, 33);
   entity_->RequestCommit(data);
 
   EXPECT_TRUE(entity_->HasPendingCommit());
 
   entity_->ReceiveUpdate(33);  // Version 33 == 33.
   EXPECT_TRUE(entity_->HasPendingCommit());
 }
 
 }  // namespace syncer_v2