Revert of [Sync] Eliminate verifier profile from sync_integration_tests

chrome/browser/sync/test/integration/apps_helper.cc

 // 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.
 
 #include "chrome/browser/sync/test/integration/apps_helper.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 17 matching lines @@
 namespace {
 
 std::string CreateFakeAppName(int index) {
   return "fakeapp" + base::IntToString(index);
 }
 
 }  // namespace
 
 namespace apps_helper {
 
-bool HasSameApps(Profile* profile1, Profile* profile2) {
-  return SyncAppHelper::GetInstance()->AppStatesMatch(profile1, profile2);
+bool HasSameAppsAsVerifier(int index) {
+  return SyncAppHelper::GetInstance()->AppStatesMatch(
+      test()->GetProfile(index), test()->verifier());
 }
 
-bool AllProfilesHaveSameApps() {
-  const auto& profiles = test()->GetAllProfiles();
-  for (auto* profile : profiles) {
-    if (profile != profiles.front() &&
-        !HasSameApps(profiles.front(), profile)) {
-      DVLOG(1) << "Profiles apps do not match.";
+bool AllProfilesHaveSameAppsAsVerifier() {
+  for (int i = 0; i < test()->num_clients(); ++i) {
+    if (!HasSameAppsAsVerifier(i)) {
+      DVLOG(1) << "Profile " << i << " doesn't have the same apps as the"
+                                     " verifier profile.";
       return false;
     }
   }
   return true;
 }
 
 std::string InstallApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->InstallExtension(
       profile,
       CreateFakeAppName(index),
       extensions::Manifest::TYPE_HOSTED_APP);
 }
 
 std::string InstallPlatformApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->InstallExtension(
       profile,
       CreateFakeAppName(index),
       extensions::Manifest::TYPE_PLATFORM_APP);
 }
 
 std::string InstallAppForAllProfiles(int index) {
-  std::string extension_id;
-  for (auto* profile : test()->GetAllProfiles()) {
-    extension_id = InstallApp(profile, index);
-  }
-  return extension_id;
+  for (int i = 0; i < test()->num_clients(); ++i)
+    InstallApp(test()->GetProfile(i), index);
+  return InstallApp(test()->verifier(), index);
 }
 
 void UninstallApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->UninstallExtension(
       profile, CreateFakeAppName(index));
 }
 
 void EnableApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->EnableExtension(
       profile, CreateFakeAppName(index));
 }
 
 void DisableApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->DisableExtension(
       profile, CreateFakeAppName(index));
 }
 
-bool IsAppEnabled(Profile* profile, int index) {
-  return SyncExtensionHelper::GetInstance()->IsExtensionEnabled(
-      profile, CreateFakeAppName(index));
-}
-
 void IncognitoEnableApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->IncognitoEnableExtension(
       profile, CreateFakeAppName(index));
 }
 
 void IncognitoDisableApp(Profile* profile, int index) {
   return SyncExtensionHelper::GetInstance()->IncognitoDisableExtension(
       profile, CreateFakeAppName(index));
 }
 
-bool IsIncognitoEnabled(Profile* profile, int index) {
-  return SyncExtensionHelper::GetInstance()->IsIncognitoEnabled(
-      profile, CreateFakeAppName(index));
-}
-
 void InstallAppsPendingForSync(Profile* profile) {
   SyncExtensionHelper::GetInstance()->InstallExtensionsPendingForSync(profile);
 }
 
 syncer::StringOrdinal GetPageOrdinalForApp(Profile* profile,
                                            int app_index) {
   return SyncAppHelper::GetInstance()->GetPageOrdinalForApp(
       profile, CreateFakeAppName(app_index));
 }
 
@@ skipping 231 matching lines @@
   for (int i = 0; i < test()->num_clients(); ++i) {
     profiles.push_back(test()->GetProfile(i));
   }
 
   AppsMatchChecker checker(profiles);
   checker.Wait();
   return !checker.TimedOut();
 }
 
 }  // namespace apps_helper