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

Unified Diff: chrome/browser/ui/app_list/extension_app_model_builder_unittest.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/ui/app_list/extension_app_model_builder_unittest.cc
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
index b07eb0f4f0d80a42f75d95b158cc3697d6248616..c40880872636c3802fcdede2e7a4695ec1ef3eed 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
@@ -250,7 +250,8 @@ TEST_F(ExtensionAppModelBuilderTest, Reinstall) {
}
TEST_F(ExtensionAppModelBuilderTest, OrdinalPrefsChange) {
- extensions::AppSorting* sorting = service_->extension_prefs()->app_sorting();
+ extensions::AppSorting* sorting =
+ extensions::ExtensionPrefs::Get(profile_.get())->app_sorting();
syncer::StringOrdinal package_app_page =
sorting->GetPageOrdinal(kPackagedApp1Id);
@@ -272,7 +273,8 @@ TEST_F(ExtensionAppModelBuilderTest, OrdinalPrefsChange) {
}
TEST_F(ExtensionAppModelBuilderTest, OnExtensionMoved) {
- extensions::AppSorting* sorting = service_->extension_prefs()->app_sorting();
+ extensions::AppSorting* sorting =
+ extensions::ExtensionPrefs::Get(profile_.get())->app_sorting();
sorting->SetPageOrdinal(kHostedAppId,
sorting->GetPageOrdinal(kPackagedApp1Id));
@@ -294,11 +296,13 @@ TEST_F(ExtensionAppModelBuilderTest, OnExtensionMoved) {
TEST_F(ExtensionAppModelBuilderTest, InvalidOrdinal) {
// Creates a no-ordinal case.
- extensions::AppSorting* sorting = service_->extension_prefs()->app_sorting();
+ extensions::AppSorting* sorting =
+ extensions::ExtensionPrefs::Get(profile_.get())->app_sorting();
sorting->ClearOrdinals(kPackagedApp1Id);
// Creates a corrupted ordinal case.
- extensions::ExtensionScopedPrefs* scoped_prefs = service_->extension_prefs();
+ extensions::ExtensionScopedPrefs* scoped_prefs =
+ extensions::ExtensionPrefs::Get(profile_.get());
scoped_prefs->UpdateExtensionPref(
kHostedAppId,
"page_ordinal",
@@ -313,7 +317,8 @@ TEST_F(ExtensionAppModelBuilderTest, OrdinalConfilicts) {
syncer::StringOrdinal conflict_ordinal =
syncer::StringOrdinal::CreateInitialOrdinal();
- extensions::AppSorting* sorting = service_->extension_prefs()->app_sorting();
+ extensions::AppSorting* sorting =
+ extensions::ExtensionPrefs::Get(profile_.get())->app_sorting();
sorting->SetPageOrdinal(kHostedAppId, conflict_ordinal);
sorting->SetAppLaunchOrdinal(kHostedAppId, conflict_ordinal);
« no previous file with comments | « chrome/browser/ui/app_list/extension_app_model_builder.cc ('k') | chrome/browser/ui/app_list/recommended_apps.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698