Revert of [sync] "TwoClientBookmarksSyncTest.Sanity" is flaky

chrome/browser/sync/test/integration/bookmarks_helper.cc

Index: chrome/browser/sync/test/integration/bookmarks_helper.cc
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 2bf99e1fd4b4cdaf2e7826e0d8892cee6c2f3e5f..2fc3a42c2c1c354ccdcb1e1420fc4babfe6ec472 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -235,6 +235,8 @@
     model->GetFavicon(node);
     observer.WaitForGetFavicon();
   }
+  EXPECT_TRUE(node->is_favicon_loaded());
+  EXPECT_FALSE(model->GetFavicon(node).IsEmpty());
   return FaviconData(model->GetFavicon(node), node->icon_url());
 }
 
@@ -904,18 +906,6 @@
   return "Waiting for matching models";
 }
 
-BookmarksMatchVerifierChecker::BookmarksMatchVerifierChecker()
-    : MultiClientStatusChangeChecker(
-          sync_datatype_helper::test()->GetSyncServices()) {}
-
-bool BookmarksMatchVerifierChecker::IsExitConditionSatisfied() {
-  return bookmarks_helper::AllModelsMatchVerifier();
-}
-
-std::string BookmarksMatchVerifierChecker::GetDebugMessage() const {
-  return "Waiting for model to match verifier";
-}
-
 BookmarksTitleChecker::BookmarksTitleChecker(int profile_index,
                                              const std::string& title,
                                              int expected_count)