Sync: fix for the code that checks whether the initial download has completed

sync/engine/syncer_unittest.cc

 // Copyright 2012 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 <algorithm>
 #include <limits>
 #include <list>
@@ skipping 4318 matching lines @@
     ASSERT_TRUE(tag2.GetId().ServerKnows());
     ASSERT_TRUE(id4 == tag2.GetId());
     EXPECT_FALSE(tag2.GetIsDel());
     EXPECT_FALSE(tag2.GetIsUnappliedUpdate());
     EXPECT_FALSE(tag2.GetIsUnsynced());
     EXPECT_EQ(11, tag2.GetBaseVersion());
     EXPECT_EQ("tag2", tag2.GetUniqueClientTag());
     tag2_metahandle = tag2.GetMetahandle();
 
     // Preferences type root should have been created by the updates above.
+    ASSERT_TRUE(directory()->InitialSyncEndedForType(&trans, PREFERENCES));
+
     Entry pref_root(&trans, GET_TYPE_ROOT, PREFERENCES);
     ASSERT_TRUE(pref_root.good());
 
     syncable::Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, pref_root.GetId(), &children);
     ASSERT_EQ(2U, children.size());
   }
 
   syncable::Id id2 = TestIdFactory::MakeServer("2");
   mock_server_->AddUpdatePref(id2.GetServerId(), "", "tag1", 12, 120);
@@ skipping 22 matching lines @@
     ASSERT_EQ(id3, tag2.GetId())
         << "ID 3 should be kept, since it was less than ID 4.";
     EXPECT_FALSE(tag2.GetIsDel());
     EXPECT_FALSE(tag2.GetIsUnappliedUpdate());
     EXPECT_FALSE(tag2.GetIsUnsynced());
     EXPECT_EQ(13, tag2.GetBaseVersion());
     EXPECT_EQ("tag2", tag2.GetUniqueClientTag());
     EXPECT_EQ(tag2_metahandle, tag2.GetMetahandle());
 
     // Preferences type root should have been created by the updates above.
+    ASSERT_TRUE(directory()->InitialSyncEndedForType(&trans, PREFERENCES));
+
     Entry pref_root(&trans, GET_TYPE_ROOT, PREFERENCES);
     ASSERT_TRUE(pref_root.good());
 
     syncable::Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, pref_root.GetId(), &children);
     ASSERT_EQ(2U, children.size());
   }
 }
 
 TEST_F(SyncerTest, ClientTagClashWithinBatchOfUpdates) {
@@ skipping 62 matching lines @@
     ASSERT_TRUE(tag_c.good());
     EXPECT_TRUE(tag_c.GetId().ServerKnows());
     EXPECT_EQ(ids_.FromNumber(201), tag_c.GetId());
     EXPECT_FALSE(tag_c.GetIsDel());
     EXPECT_FALSE(tag_c.GetIsUnappliedUpdate());
     EXPECT_FALSE(tag_c.GetIsUnsynced());
     EXPECT_EQ(21, tag_c.GetBaseVersion());
     EXPECT_EQ("tag c", tag_c.GetUniqueClientTag());
 
     // Preferences type root should have been created by the updates above.
+    ASSERT_TRUE(directory()->InitialSyncEndedForType(&trans, PREFERENCES));
+
     Entry pref_root(&trans, GET_TYPE_ROOT, PREFERENCES);
     ASSERT_TRUE(pref_root.good());
 
     // Verify that we have exactly 3 tagged nodes under the type root.
     syncable::Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, pref_root.GetId(), &children);
     ASSERT_EQ(3U, children.size());
   }
 }
 
 // This verifies transition to implicit permanent folders.
 TEST_F(SyncerTest, EntryWithParentIdUpdatedWithEntryWithoutParentId) {
   // Make sure SPECIFICS root exists so that we can get its parent ID.
   mock_server_->AddUpdateSpecifics(1, 0, "Folder", 10, 10, true, 1,
                                    DefaultPreferencesSpecifics());
   mock_server_->SetLastUpdateServerTag(ModelTypeToRootTag(PREFERENCES));
   EXPECT_TRUE(SyncShareNudge());
 
   Id pref_root_id;
   {
     // Preferences type root should have been created by the update above.
     // We need it in order to get its ID.
     syncable::ReadTransaction trans(FROM_HERE, directory());
+
+    ASSERT_TRUE(directory()->InitialSyncEndedForType(&trans, PREFERENCES));
+
     Entry pref_root(&trans, GET_TYPE_ROOT, PREFERENCES);
     ASSERT_TRUE(pref_root.good());
     pref_root_id = pref_root.GetId();
   }
 
   // Add a preference item with explicit parent ID.
   {
     WriteTransaction trans(FROM_HERE, UNITTEST, directory());
     MutableEntry entry(&trans, CREATE, PREFERENCES, pref_root_id, "tag");
     ASSERT_TRUE(entry.good());
@@ skipping 1101 matching lines @@
     EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id);
     EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count);
     EXPECT_EQ(4U,    final_monitor_records["xyz"].bookmark_write_count);
   } else {
     EXPECT_TRUE(final_monitor_records.empty())
         << "Should not restore records after successful bookmark commit.";
   }
 }
 
 }  // namespace syncer