[Sync] Eliminate verifier profile from sync_integration_tests

chrome/browser/sync/test/integration/apps_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_APPS_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "sync/api/string_ordinal.h"
 
 class Profile;
 
 namespace apps_helper {
 
-// Returns true iff the profile with index |index| has the same apps (hosted,
-// legacy packaged and platform) as the verifier.
-bool HasSameAppsAsVerifier(int index) WARN_UNUSED_RESULT;
+// Returns true iff |profile1| has same apps (hosted, legacy packaged and
+// platform) as |profile2|.
+bool HasSameApps(Profile* profile1, Profile* profile2);
 
 // Returns true iff all existing profiles have the same apps (hosted,
-// legacy packaged and platform) as the verifier.
-bool AllProfilesHaveSameAppsAsVerifier() WARN_UNUSED_RESULT;
+// legacy packaged and platform).
+bool AllProfilesHaveSameApps() WARN_UNUSED_RESULT;
 
 // Installs the app for the given index to |profile|, and returns the extension
 // ID of the new app.
 std::string InstallApp(Profile* profile, int index);
 
 // Installs the platform app for the given index to |profile|, and returns the
 // extension ID of the new app. Indices passed to this method should be distinct
 // from indices passed to InstallApp.
 std::string InstallPlatformApp(Profile* profile, int index);
 
 // Installs the app for the given index to all profiles (including the
 // verifier), and returns the extension ID of the new app.
 std::string InstallAppForAllProfiles(int index);
 
 // Uninstalls the app for the given index from |profile|. Assumes that it was
 // previously installed.
 void UninstallApp(Profile* profile, int index);
 
 // Installs all pending synced apps for |profile|.
 void InstallAppsPendingForSync(Profile* profile);
 
 // Enables the app for the given index on |profile|.
 void EnableApp(Profile* profile, int index);
 
 // Disables the app for the given index on |profile|.
 void DisableApp(Profile* profile, int index);
 
+// Returns true if the app with index |index| is enabled on |profile|.
+bool IsAppEnabled(Profile* profile, int index);
+
 // Enables the app for the given index in incognito mode on |profile|.
 void IncognitoEnableApp(Profile* profile, int index);
 
 // Disables the app for the given index in incognito mode on |profile|.
 void IncognitoDisableApp(Profile* profile, int index);
 
+// Returns true if the app with index |index| is enabled in incognito mode on
+// |profile|.
+bool IsIncognitoEnabled(Profile* profile, int index);
+
 // Gets the page ordinal value for the application at the given index on
 // |profile|.
 syncer::StringOrdinal GetPageOrdinalForApp(Profile* profile, int app_index);
 
 // Sets a new |page_ordinal| value for the application at the given index
 // on |profile|.
 void SetPageOrdinalForApp(
     Profile* profile, int app_index,
     const syncer::StringOrdinal& page_ordinal);
 
@@ skipping 19 matching lines @@
 
 // Waits until all profiles have the same set of apps. In case verifier profile
 // is enabled, it waits until all profiles match the verifier.
 //
 // Returns false on time out.
 bool AwaitAllProfilesHaveSameApps();
 
 }  // namespace apps_helper
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_