chrome/browser/extensions/api/storage/settings_frontend_unittest.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

Unified Diff: chrome/browser/extensions/api/storage/settings_frontend_unittest.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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

« no previous file with comments | « chrome/browser/extensions/api/socket/socket_api_unittest.cc ('k') | chrome/browser/extensions/api/storage/settings_sync_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/storage/settings_frontend_unittest.cc

diff --git a/chrome/browser/extensions/api/storage/settings_frontend_unittest.cc b/chrome/browser/extensions/api/storage/settings_frontend_unittest.cc

index 07a473d909dc51e84c622133b80d224a4255820e..0bd7f458a00ada7d4028b6308720e334bc846f15 100644

--- a/chrome/browser/extensions/api/storage/settings_frontend_unittest.cc

+++ b/chrome/browser/extensions/api/storage/settings_frontend_unittest.cc

@@ -96,7 +96,7 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {

ExtensionServiceInterface* esi =

extensions::ExtensionSystem::Get(profile_.get())->extension_service();

static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->

- AddExtensionWithId(id, Extension::TYPE_EXTENSION);

+ AddExtensionWithId(id, Manifest::TYPE_EXTENSION);

ValueStore* storage = util::GetStorage(id, frontend_.get());

@@ -129,7 +129,7 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsClearedOnUninstall) {

ExtensionServiceInterface* esi =

extensions::ExtensionSystem::Get(profile_.get())->extension_service();

static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->

- AddExtensionWithId(id, Extension::TYPE_LEGACY_PACKAGED_APP);

+ AddExtensionWithId(id, Manifest::TYPE_LEGACY_PACKAGED_APP);

ValueStore* storage = util::GetStorage(id, frontend_.get());

@@ -157,7 +157,7 @@ TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {

ExtensionServiceInterface* esi =

extensions::ExtensionSystem::Get(profile_.get())->extension_service();

static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->

- AddExtensionWithId(id, Extension::TYPE_EXTENSION);

+ AddExtensionWithId(id, Manifest::TYPE_EXTENSION);

ValueStore* storage = util::GetStorage(id, frontend_.get());

@@ -195,7 +195,7 @@ TEST_F(ExtensionSettingsFrontendTest,

ExtensionServiceInterface* esi =

extensions::ExtensionSystem::Get(profile_.get())->extension_service();

static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->

- AddExtensionWithId(id, Extension::TYPE_EXTENSION);

+ AddExtensionWithId(id, Manifest::TYPE_EXTENSION);

ValueStore* sync_storage =

util::GetStorage(id, settings::SYNC, frontend_.get());

@@ -274,7 +274,7 @@ TEST_F(ExtensionSettingsFrontendTest,

ExtensionServiceInterface* esi =

extensions::ExtensionSystem::Get(profile_.get())->extension_service();

static_cast<extensions::settings_test_util::MockExtensionService*>(esi)->

- AddExtensionWithIdAndPermissions(id, Extension::TYPE_EXTENSION,

+ AddExtensionWithIdAndPermissions(id, Manifest::TYPE_EXTENSION,

permissions);

frontend_->RunWithStorage(