Revert of [Sync] Eliminate verifier profile from sync_integration_tests

chrome/browser/sync/test/integration/two_client_apps_sync_test.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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/apps_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_app_helper.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "sync/api/string_ordinal.h"
 
-using apps_helper::AllProfilesHaveSameApps;
+using apps_helper::AllProfilesHaveSameAppsAsVerifier;
 using apps_helper::CopyNTPOrdinals;
 using apps_helper::DisableApp;
 using apps_helper::EnableApp;
 using apps_helper::FixNTPOrdinalCollisions;
 using apps_helper::GetAppLaunchOrdinalForApp;
+using apps_helper::HasSameAppsAsVerifier;
 using apps_helper::IncognitoDisableApp;
 using apps_helper::IncognitoEnableApp;
 using apps_helper::InstallApp;
 using apps_helper::InstallPlatformApp;
 using apps_helper::SetAppLaunchOrdinalForApp;
 using apps_helper::SetPageOrdinalForApp;
 using apps_helper::UninstallApp;
 using apps_helper::AwaitAllProfilesHaveSameApps;
 
 namespace {
 
 extensions::ExtensionRegistry* GetExtensionRegistry(Profile* profile) {
   return extensions::ExtensionRegistry::Get(profile);
 }
 
 ExtensionService* GetExtensionService(Profile* profile) {
   return extensions::ExtensionSystem::Get(profile)->extension_service();
 }
 
 }  // namespace
 
 class TwoClientAppsSyncTest : public SyncTest {
  public:
-  TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {
-    DisableVerifier();
-  }
+  TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {}
 
   ~TwoClientAppsSyncTest() override {}
 
   bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientAppsSyncTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(StartWithNoApps)) {
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(StartWithSameApps)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupClients());
 
   const int kNumApps = 5;
   for (int i = 0; i < kNumApps; ++i) {
     InstallApp(GetProfile(0), i);
     InstallApp(GetProfile(1), i);
   }
 
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // Install some apps on both clients, some on only one client, some on only the
 // other, and sync.  Both clients should end up with all apps, and the app and
 // page ordinals should be identical.
 // Disabled, see http://crbug.com/434438 for details.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, DISABLED_StartWithDifferentApps) {
   ASSERT_TRUE(SetupClients());
 
   int i = 0;
 
   const int kNumCommonApps = 5;
   for (int j = 0; j < kNumCommonApps; ++i, ++j) {
     InstallApp(GetProfile(0), i);
     InstallApp(GetProfile(1), i);
+    InstallApp(verifier(), i);
   }
 
   const int kNumProfile0Apps = 10;
   for (int j = 0; j < kNumProfile0Apps; ++i, ++j) {
     InstallApp(GetProfile(0), i);
+    InstallApp(verifier(), i);
+    CopyNTPOrdinals(GetProfile(0), verifier(), i);
   }
 
   const int kNumProfile1Apps = 10;
   for (int j = 0; j < kNumProfile1Apps; ++i, ++j) {
     InstallApp(GetProfile(1), i);
+    InstallApp(verifier(), i);
+    CopyNTPOrdinals(GetProfile(1), verifier(), i);
   }
 
   const int kNumPlatformApps = 5;
   for (int j = 0; j < kNumPlatformApps; ++i, ++j) {
     InstallPlatformApp(GetProfile(1), i);
+    InstallPlatformApp(verifier(), i);
+    CopyNTPOrdinals(GetProfile(1), verifier(), i);
   }
+
+  FixNTPOrdinalCollisions(verifier());
+
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // Install some apps on both clients, then sync.  Then install some apps on only
 // one client, some on only the other, and then sync again.  Both clients should
 // end up with all apps, and the app and page ordinals should be identical.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest,
                        E2E_ENABLED(InstallDifferentApps)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupClients());
 
   int i = 0;
 
   const int kNumCommonApps = 5;
   for (int j = 0; j < kNumCommonApps; ++i, ++j) {
     InstallApp(GetProfile(0), i);
     InstallApp(GetProfile(1), i);
   }
 
   ASSERT_TRUE(SetupSync());
 
   const int kNumProfile0Apps = 10;
   for (int j = 0; j < kNumProfile0Apps; ++i, ++j) {
     InstallApp(GetProfile(0), i);
   }
 
   const int kNumProfile1Apps = 10;
   for (int j = 0; j < kNumProfile1Apps; ++i, ++j) {
     InstallApp(GetProfile(1), i);
   }
 
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // TCM ID - 3711279.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(Add)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 0);
 
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // TCM ID - 3706267.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(Uninstall)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   UninstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // Install an app on one client, then sync. Then uninstall the app on the first
 // client and sync again. Now install a new app on the first client and sync.
 // Both client should only have the second app, with identical app and page
 // ordinals.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest,
                        E2E_ENABLED(UninstallThenInstall)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   UninstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 1);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // TCM ID - 3699295.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(Merge)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   UninstallApp(GetProfile(0), 0);
 
   InstallApp(GetProfile(0), 1);
   InstallApp(GetProfile(0), 2);
 
   InstallApp(GetProfile(1), 2);
   InstallApp(GetProfile(1), 3);
 
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // TCM ID - 7723126.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest,
                        E2E_ENABLED(UpdateEnableDisableApp)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   DisableApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   EnableApp(GetProfile(1), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // TCM ID - 7706637.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest,
                        E2E_ENABLED(UpdateIncognitoEnableDisable)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   IncognitoEnableApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   IncognitoDisableApp(GetProfile(1), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // Install the same app on both clients, then sync. Change the page ordinal on
 // one client and sync. Both clients should have the updated page ordinal for
 // the app.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(UpdatePageOrdinal)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   syncer::StringOrdinal initial_page =
       syncer::StringOrdinal::CreateInitialOrdinal();
   InstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   syncer::StringOrdinal second_page = initial_page.CreateAfter();
   SetPageOrdinalForApp(GetProfile(0), 0, second_page);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // Install the same app on both clients, then sync. Change the app launch
 // ordinal on one client and sync. Both clients should have the updated app
 // launch ordinal for the app.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest,
                        E2E_ENABLED(UpdateAppLaunchOrdinal)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   InstallApp(GetProfile(0), 0);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   syncer::StringOrdinal initial_position =
       GetAppLaunchOrdinalForApp(GetProfile(0), 0);
 
   syncer::StringOrdinal second_position = initial_position.CreateAfter();
   SetAppLaunchOrdinalForApp(GetProfile(0), 0, second_position);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // Adjust the CWS location within a page on the first client and sync. Adjust
 // which page the CWS appears on and sync. Both clients should have the same
 // page and app launch ordinal values for the CWS.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(UpdateCWSOrdinals)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   // Change the app launch ordinal.
   syncer::StringOrdinal cws_app_launch_ordinal =
       extensions::ExtensionSystem::Get(GetProfile(0))
           ->app_sorting()
           ->GetAppLaunchOrdinal(extensions::kWebStoreAppId);
   extensions::ExtensionSystem::Get(GetProfile(0))
       ->app_sorting()
       ->SetAppLaunchOrdinal(extensions::kWebStoreAppId,
                             cws_app_launch_ordinal.CreateAfter());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   // Change the page ordinal.
   syncer::StringOrdinal cws_page_ordinal =
       extensions::ExtensionSystem::Get(GetProfile(1))
           ->app_sorting()
           ->GetPageOrdinal(extensions::kWebStoreAppId);
   extensions::ExtensionSystem::Get(GetProfile(1))
       ->app_sorting()
       ->SetPageOrdinal(extensions::kWebStoreAppId,
                        cws_page_ordinal.CreateAfter());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 // Adjust the launch type on the first client and sync. Both clients should
 // have the same launch type values for the CWS.
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, E2E_ENABLED(UpdateLaunchType)) {
+  DisableVerifier();
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   // Change the launch type to window.
   extensions::SetLaunchType(GetProfile(1), extensions::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_WINDOW);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
   ASSERT_EQ(
       extensions::GetLaunchTypePrefValue(
           extensions::ExtensionPrefs::Get(GetProfile(0)),
           extensions::kWebStoreAppId),
       extensions::LAUNCH_TYPE_WINDOW);
 
   // Change the launch type to regular tab.
   extensions::SetLaunchType(GetProfile(1), extensions::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_REGULAR);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   ASSERT_EQ(
       extensions::GetLaunchTypePrefValue(
           extensions::ExtensionPrefs::Get(GetProfile(0)),
           extensions::kWebStoreAppId),
       extensions::LAUNCH_TYPE_REGULAR);
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UnexpectedLaunchType) {
   ASSERT_TRUE(SetupSync());
-  ASSERT_TRUE(AllProfilesHaveSameApps());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   extensions::SetLaunchType(GetProfile(1), extensions::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_REGULAR);
+  extensions::SetLaunchType(verifier(), extensions::kWebStoreAppId,
+                            extensions::LAUNCH_TYPE_REGULAR);
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 
   const extensions::Extension* extension =
       GetExtensionRegistry(GetProfile(1))->GetExtensionById(
           extensions::kWebStoreAppId,
           extensions::ExtensionRegistry::EVERYTHING);
   ASSERT_TRUE(extension);
 
   ExtensionSyncService* extension_sync_service =
       ExtensionSyncService::Get(GetProfile(1));
@@ skipping 15 matching lines @@
       original_data.page_ordinal(),
       extensions::NUM_LAUNCH_TYPES);
   extension_sync_service->ApplySyncData(invalid_launch_type_data);
 
   // The launch type should remain the same.
   ASSERT_TRUE(AwaitAllProfilesHaveSameApps());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, BookmarkApp) {
   ASSERT_TRUE(SetupSync());
-  ASSERT_TRUE(AllProfilesHaveSameApps());
+  ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   size_t num_extensions =
       GetExtensionRegistry(GetProfile(0))->enabled_extensions().size();
 
   WebApplicationInfo web_app_info;
   web_app_info.app_url = GURL("http://www.chromium.org");
   web_app_info.title = base::UTF8ToUTF16("Test name");
   web_app_info.description = base::UTF8ToUTF16("Test description");
   ++num_extensions;
   {
     content::WindowedNotificationObserver windowed_observer(
         extensions::NOTIFICATION_CRX_INSTALLER_DONE,
         content::NotificationService::AllSources());
     extensions::CreateOrUpdateBookmarkApp(GetExtensionService(GetProfile(0)),
                                           &web_app_info);
     windowed_observer.Wait();
     EXPECT_EQ(num_extensions,
               GetExtensionRegistry(GetProfile(0))->enabled_extensions().size());
   }
   {
+    content::WindowedNotificationObserver windowed_observer(
+        extensions::NOTIFICATION_CRX_INSTALLER_DONE,
+        content::NotificationService::AllSources());
+    extensions::CreateOrUpdateBookmarkApp(GetExtensionService(verifier()),
+                                          &web_app_info);
+    windowed_observer.Wait();
+    EXPECT_EQ(num_extensions,
+              GetExtensionRegistry(verifier())->enabled_extensions().size());
+  }
+  {
     // Wait for the synced app to install.
     content::WindowedNotificationObserver windowed_observer(
         extensions::NOTIFICATION_CRX_INSTALLER_DONE,
-        base::Bind(&AllProfilesHaveSameApps));
+        base::Bind(&AllProfilesHaveSameAppsAsVerifier));
     windowed_observer.Wait();
   }
 }
 
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties