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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_icon_manager_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/extension_icon_image_unittest.cc ('k') | chrome/browser/extensions/extension_info_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_icon_manager_unittest.cc

diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc

index fcefadd0730456fe487cc522e9765dea52dbd74c..d715a0b48d6e88dc0899cafb77ce133d41d05210 100644

--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc

+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc

@@ -17,6 +17,7 @@

using content::BrowserThread;

using extensions::Extension;

+using extensions::Manifest;

// Our test class that takes care of managing the necessary threads for loading

// extension icons, and waiting for those loads to happen.

@@ -116,7 +117,7 @@ TEST_F(ExtensionIconManagerTest, LoadRemoveLoad) {

std::string error;

scoped_refptr<Extension> extension(Extension::Create(

- manifest_path.DirName(), Extension::INVALID, *manifest.get(),

+ manifest_path.DirName(), Manifest::INVALID_LOCATION, *manifest.get(),

Extension::NO_FLAGS, &error));

ASSERT_TRUE(extension.get());

TestIconManager icon_manager(this);

@@ -157,7 +158,7 @@ TEST_F(ExtensionIconManagerTest, LoadComponentExtensionResource) {

std::string error;

scoped_refptr<Extension> extension(Extension::Create(

- manifest_path.DirName(), Extension::COMPONENT, *manifest.get(),

+ manifest_path.DirName(), Manifest::COMPONENT, *manifest.get(),

Extension::NO_FLAGS, &error));

ASSERT_TRUE(extension.get());