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

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: additional cleanup 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 17d62f68510caa6e313b652ea1639089cfa92040..24ce0771bdb57a75ef4cf947572d46cf241cc4c3 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
@@ -249,7 +249,8 @@ TEST_F(ExtensionAppModelBuilderTest, Reinstall) {
}
TEST_F(ExtensionAppModelBuilderTest, OrdinalPrefsChange) {
- extensions::AppSorting* sorting = service_->extension_prefs()->app_sorting();
+ extensions::AppSorting* sorting =
+ extensions::ExtensionPrefs::Get(service_->profile())->app_sorting();
James Cook 2014/02/07 00:53:02 nit: I think all these can use profile_.get() but
Ken Rockot(use gerrit already) 2014/02/10 18:53:02 Done.
syncer::StringOrdinal package_app_page =
sorting->GetPageOrdinal(kPackagedApp1Id);
@@ -271,7 +272,8 @@ TEST_F(ExtensionAppModelBuilderTest, OrdinalPrefsChange) {
}
TEST_F(ExtensionAppModelBuilderTest, OnExtensionMoved) {
- extensions::AppSorting* sorting = service_->extension_prefs()->app_sorting();
+ extensions::AppSorting* sorting =
+ extensions::ExtensionPrefs::Get(service_->profile())->app_sorting();
sorting->SetPageOrdinal(kHostedAppId,
sorting->GetPageOrdinal(kPackagedApp1Id));
@@ -293,11 +295,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(service_->profile())->app_sorting();
sorting->ClearOrdinals(kPackagedApp1Id);
// Creates a corrupted ordinal case.
- extensions::ExtensionScopedPrefs* scoped_prefs = service_->extension_prefs();
+ extensions::ExtensionScopedPrefs* scoped_prefs =
+ extensions::ExtensionPrefs::Get(service_->profile());
scoped_prefs->UpdateExtensionPref(
kHostedAppId,
"page_ordinal",
@@ -312,7 +316,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(service_->profile())->app_sorting();
sorting->SetPageOrdinal(kHostedAppId, conflict_ordinal);
sorting->SetAppLaunchOrdinal(kHostedAppId, conflict_ordinal);

Powered by Google App Engine
This is Rietveld 408576698