Remove initial_sync_ended bits

sync/engine/syncer_unittest.cc

 // Copyright (c) 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 279 matching lines @@
     EXPECT_FALSE(client_status.hierarchy_conflict_detected());
   }
 
   void VerifyHierarchyConflictsUnspecified(
       const sync_pb::ClientToServerMessage& message) {
     // Our request should have neither confirmed nor denied hierarchy conflicts.
     const sync_pb::ClientStatus& client_status = message.client_status();
     EXPECT_FALSE(client_status.has_hierarchy_conflict_detected());
   }
 
-  bool initial_sync_ended_for_type(ModelType type) {
-    return directory()->initial_sync_ended_for_type(type);
-  }
-
   void SyncRepeatedlyToTriggerConflictResolution(SyncSession* session) {
     // We should trigger after less than 6 syncs, but extra does no harm.
     for (int i = 0 ; i < 6 ; ++i)
       syncer_->SyncShare(session, SYNCER_BEGIN, SYNCER_END);
   }
   void SyncRepeatedlyToTriggerStuckSignal(SyncSession* session) {
     // We should trigger after less than 10 syncs, but we want to avoid brittle
     // tests.
     for (int i = 0 ; i < 12 ; ++i)
       syncer_->SyncShare(session, SYNCER_BEGIN, SYNCER_END);
@@ skipping 3631 matching lines @@
   EXPECT_TRUE(committed.Get(IS_UNSYNCED));
   EXPECT_FALSE(committed.Get(IS_UNAPPLIED_UPDATE));
 
   // Inform the Mock we won't be fetching all updates.
   mock_server_->ClearUpdatesQueue();
 }
 
 // Downloads two updates and applies them successfully.
 // This is the "happy path" alternative to ConfigureFailsDontApplyUpdates.
 TEST_F(SyncerTest, ConfigureDownloadsTwoBatchesSuccess) {
-  EXPECT_FALSE(initial_sync_ended_for_type(BOOKMARKS));
-
   syncable::Id node1 = ids_.NewServerId();
   syncable::Id node2 = ids_.NewServerId();
 
   // Construct the first GetUpdates response.
   mock_server_->AddUpdateDirectory(node1, ids_.root(), "one", 1, 10);
   mock_server_->SetChangesRemaining(1);
   mock_server_->NextUpdateBatch();
 
   // Construct the second GetUpdates response.
   mock_server_->AddUpdateDirectory(node2, ids_.root(), "two", 1, 20);
 
   SyncShareConfigure();
 
   syncable::ReadTransaction trans(FROM_HERE, directory());
   // Both nodes should be downloaded and applied.
 
   Entry n1(&trans, GET_BY_ID, node1);
   ASSERT_TRUE(n1.good());
   EXPECT_FALSE(n1.Get(IS_UNAPPLIED_UPDATE));
 
   Entry n2(&trans, GET_BY_ID, node2);
   ASSERT_TRUE(n2.good());
   EXPECT_FALSE(n2.Get(IS_UNAPPLIED_UPDATE));
-
-  EXPECT_TRUE(initial_sync_ended_for_type(BOOKMARKS));
 }
 
 // Same as the above case, but this time the second batch fails to download.
 TEST_F(SyncerTest, ConfigureFailsDontApplyUpdates) {
-  EXPECT_FALSE(initial_sync_ended_for_type(BOOKMARKS));
-
   syncable::Id node1 = ids_.NewServerId();
   syncable::Id node2 = ids_.NewServerId();
 
   // The scenario: we have two batches of updates with one update each.  A
   // normal confgure step would download all the updates one batch at a time and
   // apply them.  This configure will succeed in downloading the first batch
   // then fail when downloading the second.
   mock_server_->FailNthPostBufferToPathCall(2);
 
   // Construct the first GetUpdates response.
@@ skipping 12 matching lines @@
   Entry n1(&trans, GET_BY_ID, node1);
   ASSERT_TRUE(n1.good());
   EXPECT_TRUE(n1.Get(IS_UNAPPLIED_UPDATE));
 
   // The second node was not downloaded.
   Entry n2(&trans, GET_BY_ID, node2);
   EXPECT_FALSE(n2.good());
 
   // One update remains undownloaded.
   mock_server_->ClearUpdatesQueue();
-
-  EXPECT_FALSE(initial_sync_ended_for_type(BOOKMARKS));
 }
 
 TEST_F(SyncerTest, GetKeySuccess) {
   {
     syncable::ReadTransaction rtrans(FROM_HERE, directory());
     EXPECT_TRUE(directory()->GetNigoriHandler()->NeedKeystoreKey(&rtrans));
   }
 
   SyncShareConfigure();
 
@@ skipping 679 matching lines @@
 
 TEST_F(SyncerPositionTiebreakingTest, MidLowHigh) {
   Add(mid_id_);
   Add(low_id_);
   Add(high_id_);
   SyncShareNudge();
   ExpectLocalOrderIsByServerId();
 }
 
 }  // namespace syncer