sync: Refactor bookmarks integration tests

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 <set>
 #include <string>
 #include <vector>
@@ skipping 131 matching lines @@
 
 // Checks if the bookmark models of |profile_a| and |profile_b| match each
 // other. Returns true if they match.
 bool ModelsMatch(int profile_a, int profile_b) WARN_UNUSED_RESULT;
 
 // Checks if the bookmark models of all sync profiles match each other. Does
 // not compare them with the verifier bookmark model. Returns true if they
 // 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.
 bool ContainsDuplicateBookmarks(int profile);
 
 // Returns whether a node exists with the specified url.
 bool HasNodeWithURL(int profile, const GURL& url);
 
 // Gets the node in the bookmark model of profile |profile| that has the url
 // |url|. Note: Only one instance of |url| is assumed to be present.
@@ skipping 28 matching lines @@
 
 // Returns a folder name identifiable by |i|.
 std::string IndexedFolderName(int i);
 
 // Returns a subfolder name identifiable by |i|.
 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_