[sync] "TwoClientBookmarksSyncTest.Sanity" is flaky

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

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 209 matching lines @@
 // Checker used to block until bookmarks match on all clients.
 class BookmarksMatchChecker : public MultiClientStatusChangeChecker {
  public:
   BookmarksMatchChecker();
 
   // StatusChangeChecker implementation.
   bool IsExitConditionSatisfied() override;
   std::string GetDebugMessage() const override;
 };
 
+// Checker used to block until bookmarks match the verifier bookmark model.
+class BookmarksMatchVerifierChecker : public MultiClientStatusChangeChecker {
+ public:
+  BookmarksMatchVerifierChecker();
+
+  // StatusChangeChecker implementation.
+  bool IsExitConditionSatisfied() override;
+  std::string GetDebugMessage() const override;
+};
+
 // Checker used to block until the actual number of bookmarks with the given
 // title match the expected count.
 // TODO(pvalenzuela): Remove this class and instead use
 // AwaitMatchStatusChangeChecker.
 class BookmarksTitleChecker : public SingleClientStatusChangeChecker {
  public:
   BookmarksTitleChecker(int profile_index,
                         const std::string& title,
                         int expected_count);
 
   // StatusChangeChecker implementation.
   bool IsExitConditionSatisfied() override;
   std::string GetDebugMessage() const override;
 
  private:
   const int profile_index_;
   const std::string title_;
   const int expected_count_;
 };
 
 // Checker used to block until the actual number of bookmarks with the given url
 // match the expected count.
 class BookmarksUrlChecker : public AwaitMatchStatusChangeChecker {
  public:
   BookmarksUrlChecker(int profile, const GURL& url, int expected_count);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_