[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 HasSameAppsAsVerifier(int index) {
-  return SyncAppHelper::GetInstance()->AppStatesMatch(
-      test()->GetProfile(index), test()->verifier());
+bool HasSameApps(Profile* profile1, Profile* profile2) {
+  return SyncAppHelper::GetInstance()->AppStatesMatch(profile1, profile2);
 }
 
-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.";
+bool HasSameAppsAsVerifier(int index) {

[Nicolas Zea, 2016/03/31 19:01:21]

can this be deleted?

[shadi, 2016/03/31 22:46:47]

Done.

+  return HasSameApps(test()->GetProfile(index), test()->verifier());
+}
+
+bool AllProfilesHaveSameApps() {
+  std::vector<Profile*> profiles = test()->GetAllProfiles();
+  std::vector<Profile*>::iterator it = profiles.begin();
+  Profile* profile0 = *it;

[Nicolas Zea, 2016/03/31 19:01:21]

nit: have this be part of for loop? I think you can just do profile0 =
profiles.begin().next()?

nit: you can also use auto instead of having to declare it as an iterator, here
and below (see https://google.github.io/styleguide/cppguide.html#auto)

[shadi, 2016/03/31 22:46:47]

Done.

+  ++it;
+  for (; it != profiles.end(); ++it) {
+    if (!HasSameApps(profile0, *it)) {
+      DVLOG(1) << "Profiles apps do not match.";
       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) {
-  for (int i = 0; i < test()->num_clients(); ++i)
-    InstallApp(test()->GetProfile(i), index);
-  return InstallApp(test()->verifier(), index);
+  std::string extension_id;
+  std::vector<Profile*> profiles = test()->GetAllProfiles();
+  for (std::vector<Profile*>::iterator it = profiles.begin();
+       it != profiles.end();
+       ++it) {
+    extension_id = InstallApp(*it, index);
+  }
+  return extension_id;
 }
 
 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