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

chrome/browser/sync/test/integration/bookmarks_helper.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.
 
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
@@ skipping 217 matching lines @@
       urls_with_favicons_->find(node->url()) == urls_with_favicons_->end()) {
     return FaviconData();
   }
   // If a favicon was explicitly set, we may need to wait for it to be loaded
   // via BookmarkModel::GetFavicon(), which is an asynchronous operation.
   if (!node->is_favicon_loaded()) {
     FaviconChangeObserver observer(model, node);
     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());
 }
 
 // Sets the favicon for |profile| and |node|. |profile| may be
 // |test()->verifier()|.
 void SetFaviconImpl(Profile* profile,
                     const BookmarkNode* node,
                     const GURL& icon_url,
                     const gfx::Image& image,
                     bookmarks_helper::FaviconSource favicon_source) {
@@ skipping 649 matching lines @@
           sync_datatype_helper::test()->GetSyncServices()) {}
 
 bool BookmarksMatchChecker::IsExitConditionSatisfied() {
   return bookmarks_helper::AllModelsMatch();
 }
 
 std::string BookmarksMatchChecker::GetDebugMessage() const {
   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)
     : SingleClientStatusChangeChecker(
           sync_datatype_helper::test()->GetSyncService(profile_index)),
       profile_index_(profile_index),
       title_(title),
       expected_count_(expected_count) {
   DCHECK_GE(expected_count, 0) << "expected_count must be non-negative.";
 }
@@ skipping 26 matching lines @@
 }  // namespace
 
 BookmarksUrlChecker::BookmarksUrlChecker(int profile,
                                          const GURL& url,
                                          int expected_count)
     : AwaitMatchStatusChangeChecker(base::Bind(BookmarkCountsByUrlMatch,
                                                profile,
                                                base::ConstRef(url),
                                                expected_count),
                                     "Bookmark URL counts match.") {}