[Sync] Fixing two bugs in the worker revealed by trying to add an encryption integration test.

components/sync/engine_impl/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 "components/sync/engine_impl/worker_entity_tracker.h"
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 151 matching lines @@
 TEST_F(WorkerEntityTrackerTest, ReflectedUpdateDoesntClobberCommit) {
   CommitRequestData data = MakeCommitRequestData(22, 33);
   entity_->RequestCommit(data);
 
   EXPECT_TRUE(entity_->HasPendingCommit());
 
   entity_->ReceiveUpdate(MakeUpdateResponseData(33));  // Version 33 == 33.
   EXPECT_TRUE(entity_->HasPendingCommit());
 }
 
+// Request two commits, both with the same old version. The second commit should
+// have the updated server version.
+TEST_F(WorkerEntityTrackerTest, QuickCommits) {
+  const int64_t kLocalBaseVersion = 10;
+  const int64_t kCommitResponseVersion = 11;
+  entity_->RequestCommit(MakeCommitRequestData(1, kLocalBaseVersion));
+  CommitResponseData ack;
+  ack.response_version = kCommitResponseVersion;
+  ack.id = kServerId;
+  entity_->ReceiveCommitResponse(&ack);
+
+  entity_->RequestCommit(MakeCommitRequestData(1, kLocalBaseVersion));
+  sync_pb::SyncEntity pb_entity;
+  entity_->PopulateCommitProto(&pb_entity);
+  EXPECT_EQ(kCommitResponseVersion, pb_entity.version());
+}
+
 }  // namespace syncer_v2