[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

Index: components/sync/engine_impl/worker_entity_tracker_unittest.cc
diff --git a/components/sync/engine_impl/worker_entity_tracker_unittest.cc b/components/sync/engine_impl/worker_entity_tracker_unittest.cc
index e1eb91750976904cb366bca9460d57912239042d..60cadd3017389aa45ca9427e7ff5f1dc7b1eb3b6 100644
--- a/components/sync/engine_impl/worker_entity_tracker_unittest.cc
+++ b/components/sync/engine_impl/worker_entity_tracker_unittest.cc
@@ -169,4 +169,21 @@ TEST_F(WorkerEntityTrackerTest, ReflectedUpdateDoesntClobberCommit) {
   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