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

Unified Diff: chrome/browser/extensions/settings/settings_frontend_unittest.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include Created 8 years, 1 month 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/extensions/settings/settings_frontend_unittest.cc
diff --git a/chrome/browser/extensions/settings/settings_frontend_unittest.cc b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
index 73ee6a1cd2d975525e5ee6c4b91b7ce0bf352153..34e2318000ab61a2e56da13e1958e2c04cd5535b 100644
--- a/chrome/browser/extensions/settings/settings_frontend_unittest.cc
+++ b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
@@ -94,8 +94,10 @@ class ExtensionSettingsFrontendTest : public testing::Test {
TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_EXTENSION);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_EXTENSION);
ValueStore* storage = util::GetStorage(id, frontend_.get());
@@ -125,8 +127,10 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {
TEST_F(ExtensionSettingsFrontendTest, SettingsClearedOnUninstall) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_LEGACY_PACKAGED_APP);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_LEGACY_PACKAGED_APP);
ValueStore* storage = util::GetStorage(id, frontend_.get());
@@ -151,8 +155,10 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsClearedOnUninstall) {
TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_EXTENSION);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_EXTENSION);
ValueStore* storage = util::GetStorage(id, frontend_.get());
@@ -187,8 +193,10 @@ TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {
TEST_F(ExtensionSettingsFrontendTest,
QuotaLimitsEnforcedCorrectlyForSyncAndLocal) {
const std::string id = "ext";
- profile_->GetMockExtensionService()->AddExtensionWithId(
- id, Extension::TYPE_EXTENSION);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithId(id, Extension::TYPE_EXTENSION);
ValueStore* sync_storage =
util::GetStorage(id, settings::SYNC, frontend_.get());
@@ -264,8 +272,11 @@ TEST_F(ExtensionSettingsFrontendTest,
const std::string id = "ext";
std::set<std::string> permissions;
permissions.insert("unlimitedStorage");
- profile_->GetMockExtensionService()->AddExtensionWithIdAndPermissions(
- id, Extension::TYPE_EXTENSION, permissions);
+ ExtensionServiceInterface* esi =
+ extensions::ExtensionSystem::Get(profile_.get())->extension_service();
+ static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->
+ AddExtensionWithIdAndPermissions(id, Extension::TYPE_EXTENSION,
+ permissions);
frontend_->RunWithStorage(
id, settings::SYNC, base::Bind(&UnlimitedSyncStorageTestCallback));
« no previous file with comments | « chrome/browser/extensions/settings/settings_frontend.cc ('k') | chrome/browser/extensions/settings/settings_sync_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698