Revert of [Sync] Eliminate verifier profile from sync_integration_tests

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

Index: chrome/browser/sync/test/integration/sync_app_list_helper.h
diff --git a/chrome/browser/sync/test/integration/sync_app_list_helper.h b/chrome/browser/sync/test/integration/sync_app_list_helper.h
index 90ec898f1b140242836e2b933d99032ce8bbf2fc..cd788b25b023bdb9b0bac929b471cba24c9ac2dd 100644
--- a/chrome/browser/sync/test/integration/sync_app_list_helper.h
+++ b/chrome/browser/sync/test/integration/sync_app_list_helper.h
@@ -29,8 +29,9 @@
   // internal data structures.
   void SetupIfNecessary(SyncTest* test);
 
-  // Returns true iff all existing profiles have the same app list entries.
-  bool AllProfilesHaveSameAppList();
+  // Returns true iff all existing profiles have the same app list entries
+  // as the verifier.
+  bool AllProfilesHaveSameAppListAsVerifier();
 
   // Moves an app in |profile|.
   void MoveApp(Profile* profile, size_t from, size_t to);
@@ -45,6 +46,9 @@
                          size_t index_in_folder,
                          const std::string& folder_id);
 
+  // Copies ordinals for item matching |id| from |profile1| to test_->verifier.
+  void CopyOrdinalsToVerifier(Profile* profile1, const std::string& id);
+
   // Helper function for debugging, used to log the app lists on test failures.
   void PrintAppList(Profile* profile);
 
@@ -54,9 +58,9 @@
   SyncAppListHelper();
   ~SyncAppListHelper();
 
-  // Returns true iff |profile1| has the same app list as |profile2|
+  // Returns true iff |profile| has the same app list as |test_|->verifier()
   // and the app list entries all have the same state.
-  bool AppListMatch(Profile* profile1, Profile* profile2);
+  bool AppListMatchesVerifier(Profile* profile);
 
   // Helper function for debugging, logs info for an item, including the
   // contents of any folder items.