Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3695)

Unified Diff: chrome/browser/sync/test/integration/two_client_apps_sync_test.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
index 8ae327238cb608e4792d2f8910fa9df929c935e4..b99a9a9739dd5ee4d8c4e56452a12f12743c1f8b 100644
--- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/common/extensions/extension_constants.h"
#include "extensions/browser/app_sorting.h"
+#include "extensions/browser/extension_prefs.h"
#include "sync/api/string_ordinal.h"
using apps_helper::AllProfilesHaveSameAppsAsVerifier;
@@ -396,29 +397,29 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateCWSOrdinals) {
// Change the app launch ordinal.
syncer::StringOrdinal cws_app_launch_ordinal =
- GetProfile(0)->GetExtensionService()->
- extension_prefs()->app_sorting()->GetAppLaunchOrdinal(
- extension_misc::kWebStoreAppId);
- GetProfile(0)->GetExtensionService()->extension_prefs()->app_sorting()->
- SetAppLaunchOrdinal(
- extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
- verifier()->GetExtensionService()->extension_prefs()->app_sorting()->
- SetAppLaunchOrdinal(
- extension_misc::kWebStoreAppId, cws_app_launch_ordinal.CreateAfter());
+ extensions::ExtensionPrefs::Get(GetProfile(0))
+ ->app_sorting()
+ ->GetAppLaunchOrdinal(extension_misc::kWebStoreAppId);
+ extensions::ExtensionPrefs::Get(GetProfile(0))
+ ->app_sorting()
+ ->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId,
+ cws_app_launch_ordinal.CreateAfter());
+ extensions::ExtensionPrefs::Get(verifier())
+ ->app_sorting()
+ ->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId,
+ cws_app_launch_ordinal.CreateAfter());
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
// Change the page ordinal.
syncer::StringOrdinal cws_page_ordinal =
- GetProfile(1)->GetExtensionService()->
- extension_prefs()->app_sorting()->GetPageOrdinal(
- extension_misc::kWebStoreAppId);
- GetProfile(1)->GetExtensionService()->extension_prefs()->
- app_sorting()->SetPageOrdinal(extension_misc::kWebStoreAppId,
- cws_page_ordinal.CreateAfter());
- verifier()->GetExtensionService()->extension_prefs()->
- app_sorting()->SetPageOrdinal(extension_misc::kWebStoreAppId,
- cws_page_ordinal.CreateAfter());
+ extensions::ExtensionPrefs::Get(GetProfile(1))
+ ->app_sorting()
+ ->GetPageOrdinal(extension_misc::kWebStoreAppId);
+ extensions::ExtensionPrefs::Get(GetProfile(1))->app_sorting()->SetPageOrdinal(
+ extension_misc::kWebStoreAppId, cws_page_ordinal.CreateAfter());
+ extensions::ExtensionPrefs::Get(verifier())->app_sorting()->SetPageOrdinal(
+ extension_misc::kWebStoreAppId, cws_page_ordinal.CreateAfter());
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
}
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698