First-time sync: asymptotic running time improvement

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 5d6331f71f67648eddc91d1d74349796d7b4bce1..0aa7e3557e26a04cbfabeda58401a16f30adf4f9 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -3568,7 +3568,7 @@ TEST_F(SyncerTest, MergingExistingItems) {
   SyncRepeatedlyToTriggerConflictResolution(session_.get());
 }
 
-TEST_F(SyncerTest, DISABLED_OneBajillionUpdates) {
+TEST_F(SyncerTest, OneBajillionUpdates) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   CHECK(dir.good());
   int one_bajillion = 4000;
@@ -5000,12 +5000,12 @@ class SyncerPositionUpdateTest : public SyncerTest {
       Id id = i->second;
       Entry entry_with_id(&trans, GET_BY_ID, id);
       EXPECT_TRUE(entry_with_id.good());
-      EXPECT_TRUE(entry_with_id.Get(PREV_ID) == prev_id);
-      EXPECT_TRUE(entry_with_id.Get(SERVER_POSITION_IN_PARENT) == i->first);
+      EXPECT_EQ(prev_id, entry_with_id.Get(PREV_ID));
+      EXPECT_EQ(i->first, entry_with_id.Get(SERVER_POSITION_IN_PARENT));
       if (next == position_map_.end()) {
-        EXPECT_TRUE(entry_with_id.Get(NEXT_ID).IsRoot());
+        EXPECT_EQ(Id(), entry_with_id.Get(NEXT_ID));
       } else {
-        EXPECT_TRUE(entry_with_id.Get(NEXT_ID) == next->second);
+        EXPECT_EQ(next->second, entry_with_id.Get(NEXT_ID));
         next++;
       }
       prev_id = id;