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

Unified Diff: chrome/browser/extensions/extension_action_icon_factory_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/default_apps_unittest.cc ('k') | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_action_icon_factory_unittest.cc
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index 6b358825b9aace9ce91cd25d1b6b48a17e83772f..9728e2b422f2a7ee559450c68dd89e07e8c82faa 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -95,7 +95,7 @@ class ExtensionActionIconFactoryTest
}
scoped_refptr<Extension> CreateExtension(const char* name,
- Extension::Location location) {
+ Manifest::Location location) {
// Create and load an extension.
FilePath test_file;
if (!PathService::Get(chrome::DIR_TEST_DATA, &test_file)) {
@@ -177,7 +177,7 @@ TEST_F(ExtensionActionIconFactoryTest, NoIcons) {
// Load an extension that has browser action without default icon set in the
// manifest and does not call |SetIcon| by default.
scoped_refptr<Extension> extension(CreateExtension(
- "browser_action/no_icon", Extension::INVALID));
+ "browser_action/no_icon", Manifest::INVALID_LOCATION));
ASSERT_TRUE(extension.get() != NULL);
ExtensionAction* browser_action = GetBrowserAction(*extension);
ASSERT_TRUE(browser_action);
@@ -202,7 +202,7 @@ TEST_F(ExtensionActionIconFactoryTest, AfterSetIcon) {
// manifest and does not call |SetIcon| by default (but has an browser action
// icon resource).
scoped_refptr<Extension> extension(CreateExtension(
- "browser_action/no_icon", Extension::INVALID));
+ "browser_action/no_icon", Manifest::INVALID_LOCATION));
ASSERT_TRUE(extension.get() != NULL);
ExtensionAction* browser_action = GetBrowserAction(*extension);
ASSERT_TRUE(browser_action);
@@ -239,7 +239,7 @@ TEST_F(ExtensionActionIconFactoryTest, DefaultIcon) {
// manifest and does not call |SetIcon| by default (but has an browser action
// icon resource).
scoped_refptr<Extension> extension(CreateExtension(
- "browser_action/no_icon", Extension::INVALID));
+ "browser_action/no_icon", Manifest::INVALID_LOCATION));
ASSERT_TRUE(extension.get() != NULL);
ExtensionAction* browser_action = GetBrowserAction(*extension);
ASSERT_TRUE(browser_action);
« no previous file with comments | « chrome/browser/extensions/default_apps_unittest.cc ('k') | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698