Cleanup: Remove deprecated Profile::GetExtensionService().

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 "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/app_sync_data.h"
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 #include "chrome/browser/extensions/extension_service.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 "chrome/common/extensions/extension_constants.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 "sync/api/string_ordinal.h"
 
 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::InstallAppsPendingForSync;
 using apps_helper::InstallPlatformApp;
 using apps_helper::SetAppLaunchOrdinalForApp;
 using apps_helper::SetPageOrdinalForApp;
 using apps_helper::UninstallApp;
 using sync_integration_test_util::AwaitCommitActivityCompletion;
 
+namespace {
+
+ExtensionService* GetExtensionService(Profile* profile) {
+  return extensions::ExtensionSystem::Get(profile)->extension_service();
+}
+
+}  // namespace
+
 class TwoClientAppsSyncTest : public SyncTest {
  public:
   TwoClientAppsSyncTest() : SyncTest(TWO_CLIENT) {}
 
   virtual ~TwoClientAppsSyncTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientAppsSyncTest);
 };
 
@@ skipping 390 matching lines @@
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // 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, UpdateLaunchType) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   // Change the launch type to window.
-  extensions::SetLaunchType(GetProfile(1)->GetExtensionService(),
+  extensions::SetLaunchType(GetExtensionService(GetProfile(1)),
                             extension_misc::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_WINDOW);
-  extensions::SetLaunchType(verifier()->GetExtensionService(),
+  extensions::SetLaunchType(GetExtensionService(verifier()),
                             extension_misc::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_WINDOW);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   // Change the launch type to regular tab.
-  extensions::SetLaunchType(GetProfile(1)->GetExtensionService(),
+  extensions::SetLaunchType(GetExtensionService(GetProfile(1)),
                             extension_misc::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_REGULAR);
   ASSERT_FALSE(HasSameAppsAsVerifier(1));
-  extensions::SetLaunchType(verifier()->GetExtensionService(),
+  extensions::SetLaunchType(GetExtensionService(verifier()),
                             extension_misc::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_REGULAR);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UnexpectedLaunchType) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
-  extensions::SetLaunchType(GetProfile(1)->GetExtensionService(),
+  extensions::SetLaunchType(GetExtensionService(GetProfile(1)),
                             extension_misc::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_REGULAR);
-  extensions::SetLaunchType(verifier()->GetExtensionService(),
+  extensions::SetLaunchType(GetExtensionService(verifier()),
                             extension_misc::kWebStoreAppId,
                             extensions::LAUNCH_TYPE_REGULAR);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   const extensions::Extension* extension =
-      GetProfile(1)->GetExtensionService()->
-          GetInstalledExtension(extension_misc::kWebStoreAppId);
+      GetExtensionService(GetProfile(1))->GetInstalledExtension(

[Devlin, 2014/06/25 19:38:48]

nit: ExtensionRegistry::GetExtensionById(id, ExtensionRegistry::EVERYTHING);

[Lei Zhang, 2014/06/25 19:58:31]

Done.

+          extension_misc::kWebStoreAppId);
   ASSERT_TRUE(extension);
 
   ExtensionSyncService* extension_sync_service =
       ExtensionSyncService::Get(GetProfile(1));
 
   extensions::AppSyncData original_data(
       extension_sync_service->GetAppSyncData(*extension));
 
   // Create an invalid launch type and ensure it doesn't get down-synced. This
   // simulates the case of a future launch type being added which old versions
@@ skipping 11 matching lines @@
   // The launch type should remain the same.
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, BookmarkApp) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   size_t num_extensions =
-      GetProfile(0)->GetExtensionService()->extensions()->size();
+      GetExtensionService(GetProfile(0))->extensions()->size();

[Devlin, 2014/06/25 19:38:48]

nit: ExtensionRegistry::enabled_extensions().size()

[Lei Zhang, 2014/06/25 19:58:31]

Done.

 
   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(
         chrome::NOTIFICATION_CRX_INSTALLER_DONE,
         content::NotificationService::AllSources());
-    extensions::CreateOrUpdateBookmarkApp(GetProfile(0)->GetExtensionService(),
+    extensions::CreateOrUpdateBookmarkApp(GetExtensionService(GetProfile(0)),
                                           web_app_info);
     windowed_observer.Wait();
     EXPECT_EQ(num_extensions,
               extensions::ExtensionRegistry::Get(GetProfile(0))
                   ->enabled_extensions()
                   .size());
   }
   {
     content::WindowedNotificationObserver windowed_observer(
         chrome::NOTIFICATION_CRX_INSTALLER_DONE,
         content::NotificationService::AllSources());
-    extensions::CreateOrUpdateBookmarkApp(verifier()->GetExtensionService(),
+    extensions::CreateOrUpdateBookmarkApp(GetExtensionService(verifier()),
                                           web_app_info);
     windowed_observer.Wait();
     EXPECT_EQ(num_extensions,
               extensions::ExtensionRegistry::Get(verifier())
                   ->enabled_extensions()
                   .size());
   }
   {
     // Wait for the synced app to install.
     content::WindowedNotificationObserver windowed_observer(
         chrome::NOTIFICATION_CRX_INSTALLER_DONE,
         content::NotificationService::AllSources());
     ASSERT_TRUE(AwaitQuiescence());
     windowed_observer.Wait();
     ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
   }
 }
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties