sync: Refactor bookmarks integration tests

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

Index: chrome/browser/sync/test/integration/bookmarks_helper.h
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.h b/chrome/browser/sync/test/integration/bookmarks_helper.h
index b87839096603562befc28de110873574ff9d4e84..d90e7a0788ef68c7eff4fa890cf40ba099f31773 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.h
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.h
@@ -149,11 +149,6 @@ bool ModelsMatch(int profile_a, int profile_b) WARN_UNUSED_RESULT;
 // match.
 bool AllModelsMatch() WARN_UNUSED_RESULT;
 
-// Check if the bookmarks models of all sync profiles match each other, using
-// AllModelsMatch. Returns true if bookmark models match and don't timeout
-// while checking.
-bool AwaitAllModelsMatch() WARN_UNUSED_RESULT;
-
 // Checks if the bookmark model of profile |profile| contains any instances of
 // two bookmarks with the same URL under the same parent folder. Returns true
 // if even one instance is found.
@@ -202,6 +197,16 @@ std::string IndexedSubfolderName(int i);
 // Returns a subsubfolder name identifiable by |i|.
 std::string IndexedSubsubfolderName(int i);
 
+// Check if the bookmarks models of all sync profiles match each other, using
+// AllModelsMatch. Returns true if bookmark models match and don't timeout
+// while checking.
+bool AwaitAllModelsMatch();
+
+// Check if the bookmarks models of all sync profiles match each other and the
+// verifier profile, using AllModelsMatchVerifier. Returns true if bookmark
+// models match and don't timeout while checking.
+bool AwaitAllModelsMatchVerifier();
+
 }  // namespace bookmarks_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_BOOKMARKS_HELPER_H_