sync: use progress markers instead of timestamps during GetUpdates

chrome/browser/sync/engine/syncer_unittest.cc

 // Copyright (c) 2010 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.
 //
 // Syncer unit tests. Unfortunately a lot of these tests
 // are outdated and need to be reworked and updated.
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 3549 matching lines @@
   mock_server_->AddUpdateBookmark(1, 0, "Copy of base", 50, 50);
   SyncRepeatedlyToTriggerConflictResolution(session_.get());
 }
 
 // In this test a long changelog contains a child at the start of the changelog
 // and a parent at the end. While these updates are in progress the client would
 // appear stuck.
 TEST_F(SyncerTest, LongChangelistWithApplicationConflict) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   CHECK(dir.good());
-  const int DEPTH = 400;
+  const int depth = 400;
   syncable::Id folder_id = ids_.FromNumber(1);
 
   // First we an item in a folder in the root. However the folder won't come
   // till much later.
   syncable::Id stuck_entry_id = TestIdFactory::FromNumber(99999);
   mock_server_->AddUpdateDirectory(stuck_entry_id,
       folder_id, "stuck", 1, 1);
-  mock_server_->SetChangesRemaining(DEPTH - 1);
+  mock_server_->SetChangesRemaining(depth - 1);
   syncer_->SyncShare(session_.get());
 
-  // Very long changelist. We should never be stuck.
-  for (int i = 0; i < DEPTH; i++) {
-    mock_server_->SetNewTimestamp(i);
-    mock_server_->SetChangesRemaining(DEPTH - i);
-    syncer_->SyncShare(session_.get());
-    EXPECT_FALSE(session_->status_controller()->syncer_status().syncer_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_->NextUpdateBatch();
+    mock_server_->SetNewTimestamp(i + 1);
+    mock_server_->SetChangesRemaining(depth - i);
+  }
 
-    // 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());
     EXPECT_TRUE(child.Get(IS_UNAPPLIED_UPDATE));
     EXPECT_TRUE(child.Get(IS_DEL));
     EXPECT_FALSE(child.Get(IS_UNSYNCED));
   }
 
   // And finally the folder.
   mock_server_->AddUpdateDirectory(folder_id,
@@ skipping 1564 matching lines @@
   Add(low_id_);
   Add(high_id_);
   SyncShareAsDelegate();
   ExpectLocalOrderIsByServerId();
 }
 
 const SyncerTest::CommitOrderingTest
 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
 
 }  // namespace browser_sync