sync: Remove the remaining conflict sets code

chrome/browser/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 1732 matching lines @@
   mock_server_->AddUpdateDirectory(3, -80, "bad_parent", 10, 10);
 
   syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
   StatusController* status = session_->mutable_status_controller();
 
   // Id 3 should be in conflict now.
   EXPECT_EQ(1, status->TotalNumConflictingItems());
   {
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
     ASSERT_TRUE(status->conflict_progress());
-    EXPECT_EQ(1, status->conflict_progress()->ConflictingItemsSize());
+    EXPECT_EQ(1, status->conflict_progress()->HierarchyConflictingItemsSize());
   }
 
   // These entries will be used in the second set of updates.
   mock_server_->AddUpdateDirectory(4, 0, "newer_version", 20, 10);
   mock_server_->AddUpdateDirectory(5, 0, "circular1", 10, 10);
   mock_server_->AddUpdateDirectory(6, 5, "circular2", 10, 10);
   mock_server_->AddUpdateDirectory(9, 3, "bad_parent_child", 10, 10);
   mock_server_->AddUpdateDirectory(100, 9, "bad_parent_child2", 10, 10);
   mock_server_->AddUpdateDirectory(10, 0, "dir_to_bookmark", 10, 10);
 
   syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
   // The three items with an unresolved parent should be unapplied (3, 9, 100).
   // The name clash should also still be in conflict.
   EXPECT_EQ(3, status->TotalNumConflictingItems());
   {
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
     ASSERT_TRUE(status->conflict_progress());
-    EXPECT_EQ(3, status->conflict_progress()->ConflictingItemsSize());
+    EXPECT_EQ(3, status->conflict_progress()->HierarchyConflictingItemsSize());
   }
 
   {
     WriteTransaction trans(FROM_HERE, UNITTEST, dir);
     // Even though it has the same name, it should work.
     Entry name_clash(&trans, GET_BY_ID, ids_.FromNumber(2));
     ASSERT_TRUE(name_clash.good());
     EXPECT_FALSE(name_clash.Get(IS_UNAPPLIED_UPDATE))
         << "Duplicate name SHOULD be OK.";
 
@@ skipping 73 matching lines @@
     EXPECT_TRUE(circular_parent_issue.Get(ID) ==
         circular_parent_target.Get(PARENT_ID));
     EXPECT_EQ(10u, circular_parent_target.Get(BASE_VERSION));
   }
 
   EXPECT_FALSE(saw_syncer_event_);
   EXPECT_EQ(4, status->TotalNumConflictingItems());
   {
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
     ASSERT_TRUE(status->conflict_progress());
-    EXPECT_EQ(4, status->conflict_progress()->ConflictingItemsSize());
+    EXPECT_EQ(4, status->conflict_progress()->HierarchyConflictingItemsSize());
   }
 }
 
 TEST_F(SyncerTest, CommitTimeRename) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   ASSERT_TRUE(dir.good());
   int64 metahandle_folder;
   int64 metahandle_new_entry;
 
   // Create a folder and an entry.
@@ skipping 665 matching lines @@
     entry.Put(SERVER_VERSION, 1);
     entry.Put(SERVER_PARENT_ID, ids_.FromNumber(9999));  // Bad parent.
     entry.Put(IS_UNSYNCED, true);
     entry.Put(IS_UNAPPLIED_UPDATE, true);
     entry.Put(SPECIFICS, DefaultBookmarkSpecifics());
     entry.Put(SERVER_SPECIFICS, DefaultBookmarkSpecifics());
     entry.Put(IS_DEL, false);
   }
   syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
   syncer_->SyncShare(session_.get(), SYNCER_BEGIN, SYNCER_END);
-  EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
+  EXPECT_EQ(1, session_->status_controller().TotalNumConflictingItems());
   saw_syncer_event_ = false;
 }
 
 // Original problem synopsis:
 //   Illegal parent
 // Unexpected error during sync if we:
 //   make a new folder bob
 //   wait for sync
 //   make a new folder fred
 //   move bob into fred
@@ skipping 392 matching lines @@
     WriteTransaction wtrans(FROM_HERE, UNITTEST, dir);
     MutableEntry A(&wtrans, GET_BY_ID, ids_.FromNumber(1));
     ASSERT_TRUE(A.good());
     MutableEntry B(&wtrans, GET_BY_ID, ids_.FromNumber(2));
     ASSERT_TRUE(B.good());
     EXPECT_TRUE(A.Get(NON_UNIQUE_NAME) == "B");
     EXPECT_TRUE(B.Get(NON_UNIQUE_NAME) == "B");
   }
 }
 
-TEST_F(SyncerTest, ConflictSetClassificationError) {
-  // This code used to cause a CHECK failure because we incorrectly thought
-  // a set was only unapplied updates.
-  ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
-  CHECK(dir.good());
-  mock_server_->AddUpdateDirectory(1, 0, "A", 10, 10);
-  mock_server_->AddUpdateDirectory(2, 0, "B", 10, 10);
-  mock_server_->set_conflict_all_commits(true);
-  SyncShareAsDelegate();
-  {
-    WriteTransaction wtrans(FROM_HERE, UNITTEST, dir);
-    MutableEntry A(&wtrans, GET_BY_ID, ids_.FromNumber(1));
-    ASSERT_TRUE(A.good());
-    A.Put(IS_UNSYNCED, true);
-    A.Put(IS_UNAPPLIED_UPDATE, true);
-    A.Put(SERVER_NON_UNIQUE_NAME, "B");
-    MutableEntry B(&wtrans, GET_BY_ID, ids_.FromNumber(2));
-    ASSERT_TRUE(B.good());
-    B.Put(IS_UNAPPLIED_UPDATE, true);
-    B.Put(SERVER_NON_UNIQUE_NAME, "A");
-  }
-  SyncShareAsDelegate();
-  saw_syncer_event_ = false;
-}
-
 TEST_F(SyncerTest, SwapEntryNames) {
   // Simple transaction test.
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   CHECK(dir.good());
   mock_server_->AddUpdateDirectory(1, 0, "A", 10, 10);
   mock_server_->AddUpdateDirectory(2, 0, "B", 10, 10);
   mock_server_->set_conflict_all_commits(true);
   SyncShareAsDelegate();
   {
     WriteTransaction wtrans(FROM_HERE, UNITTEST, dir);
@@ skipping 184 matching lines @@
     ReadTransaction trans(FROM_HERE, dir);
     Entry local_deleted(&trans, GET_BY_ID, ids_.FromNumber(1));
     EXPECT_TRUE(local_deleted.Get(BASE_VERSION) == 1);
     EXPECT_TRUE(local_deleted.Get(IS_UNAPPLIED_UPDATE) == false);
     EXPECT_TRUE(local_deleted.Get(IS_UNSYNCED) == true);
     EXPECT_TRUE(local_deleted.Get(IS_DEL) == true);
     EXPECT_TRUE(local_deleted.Get(IS_DIR) == true);
   }
 }
 
-TEST(SyncerSyncProcessState, MergeSetsTest) {
-  TestIdFactory id_factory;
-  syncable::Id id[7];
-  for (int i = 1; i < 7; i++) {
-    id[i] = id_factory.NewServerId();
-  }
-  bool is_dirty = false;
-  ConflictProgress c(&is_dirty);
-  c.MergeSets(id[1], id[2]);
-  c.MergeSets(id[2], id[3]);
-  c.MergeSets(id[4], id[5]);
-  c.MergeSets(id[5], id[6]);
-  EXPECT_EQ(6u, c.IdToConflictSetSize());
-  EXPECT_FALSE(is_dirty);
-  for (int i = 1; i < 7; i++) {
-    EXPECT_TRUE(NULL != c.IdToConflictSetGet(id[i]));
-    EXPECT_TRUE(c.IdToConflictSetGet(id[(i & ~3) + 1]) ==
-                c.IdToConflictSetGet(id[i]));
-  }
-  c.MergeSets(id[1], id[6]);
-  for (int i = 1; i < 7; i++) {
-    EXPECT_TRUE(NULL != c.IdToConflictSetGet(id[i]));
-    EXPECT_TRUE(c.IdToConflictSetGet(id[1]) == c.IdToConflictSetGet(id[i]));
-  }
-
-  // Check dupes don't cause double sets.
-  ConflictProgress identical_set(&is_dirty);
-  identical_set.MergeSets(id[1], id[1]);
-  EXPECT_TRUE(identical_set.IdToConflictSetSize() == 1);
-  EXPECT_TRUE(identical_set.IdToConflictSetGet(id[1])->size() == 1);
-  EXPECT_FALSE(is_dirty);
-}
-
 // Bug Synopsis:
 // Merge conflict resolution will merge a new local entry with another entry
 // that needs updates, resulting in CHECK.
 TEST_F(SyncerTest, MergingExistingItems) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   CHECK(dir.good());
   mock_server_->set_conflict_all_commits(true);
   mock_server_->AddUpdateBookmark(1, 0, "base", 10, 10);
   SyncShareAsDelegate();
   {
@@ skipping 232 matching lines @@
     EXPECT_NE(foo_entry.Get(syncable::ID), in_root_id);
 
     Entry bar_entry(&trans, GET_BY_HANDLE, bar_metahandle);
     ASSERT_TRUE(bar_entry.good());
     EXPECT_EQ("bar", bar_entry.Get(NON_UNIQUE_NAME));
     EXPECT_NE(bar_entry.Get(syncable::ID), in_dir_id);
     EXPECT_EQ(foo_entry.Get(syncable::ID), bar_entry.Get(PARENT_ID));
   }
 }
 
-TEST_F(SyncerTest, ConflictSetSizeReducedToOne) {
-  ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
-  CHECK(dir.good());
-
-  syncable::Id in_root_id = ids_.NewServerId();
-
-  mock_server_->AddUpdateBookmark(in_root_id, TestIdFactory::root(),
-      "in_root", 1, 1);
-  SyncShareAsDelegate();
-  {
-    WriteTransaction trans(FROM_HERE, UNITTEST, dir);
-    MutableEntry oentry(&trans, GET_BY_ID, in_root_id);
-    ASSERT_TRUE(oentry.good());
-    oentry.Put(NON_UNIQUE_NAME, "old_in_root");
-    WriteTestDataToEntry(&trans, &oentry);
-    MutableEntry entry(&trans, CREATE, trans.root_id(), "in_root");
-    ASSERT_TRUE(entry.good());
-    WriteTestDataToEntry(&trans, &entry);
-  }
-  mock_server_->set_conflict_all_commits(true);
-  // This SyncShare call used to result in a CHECK failure.
-  SyncShareAsDelegate();
-  saw_syncer_event_ = false;
-}
-
 TEST_F(SyncerTest, TestClientCommand) {
   ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
   CHECK(dir.good());
   using sync_pb::ClientCommand;
 
   ClientCommand* command = mock_server_->GetNextClientCommand();
   command->set_set_sync_poll_interval(8);
   command->set_set_sync_long_poll_interval(800);
   command->set_sessions_commit_delay_seconds(3141);
   mock_server_->AddUpdateDirectory(1, 0, "in_root", 1, 1);
@@ skipping 1306 matching lines @@
   Add(low_id_);
   Add(high_id_);
   SyncShareAsDelegate();
   ExpectLocalOrderIsByServerId();
 }
 
 const SyncerTest::CommitOrderingTest
 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
 
 }  // namespace browser_sync