sync: use progress markers instead of timestamps during GetUpdates

chrome/browser/sync/engine/syncer_unittest.cc

Index: chrome/browser/sync/engine/syncer_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index 27725b37021f3cc50dfd8e6edd9f5807aa23a59a..4919c4f36153c38f45ff064a7f9e848592878438 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -3578,14 +3578,20 @@ TEST_F(SyncerTest, LongChangelistWithApplicationConflict) {
   mock_server_->SetChangesRemaining(DEPTH - 1);
   syncer_->SyncShare(session_.get());
 
-  // Very long changelist. We should never be stuck.
+  // Buffer up a very long series of downloads.
+  // We should never be stuck (conflict resolution shouldn't
+  // kick in so long as we're making forward progress).
   for (int i = 0; i < DEPTH; i++) {
-    mock_server_->SetNewTimestamp(i);
+    mock_server_->NextUpdateBatch();
+    mock_server_->SetNewTimestamp(i + 1);
     mock_server_->SetChangesRemaining(DEPTH - i);
-    syncer_->SyncShare(session_.get());
-    EXPECT_FALSE(session_->status_controller()->syncer_status().syncer_stuck);
+  }
 
-    // Ensure our folder hasn't somehow applied.
+  syncer_->SyncShare(session_.get());
+  EXPECT_FALSE(session_->status_controller()->syncer_status().syncer_stuck);
+
+  // Ensure our folder hasn't somehow applied.
+  {
     ReadTransaction trans(dir, __FILE__, __LINE__);
     Entry child(&trans, GET_BY_ID, stuck_entry_id);
     EXPECT_TRUE(child.good());