chrome/browser/extensions/extension_nacl_browsertest.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_nacl_browsertest.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_install_prompt.cc ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | chrome/browser/extensions/external_provider_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_nacl_browsertest.cc

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

index 7d8d34c3ebefce06e7b72289a7da1e9d7f9046ec..6386d443066bcc860153a9d98a86854a6cba52a5 100644

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

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

@@ -26,6 +26,7 @@

using content::PluginService;

using content::WebContents;

using extensions::Extension;

+using extensions::Manifest;

namespace {

@@ -140,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, ComponentExtension) {

const Extension* extension = InstallExtension(INSTALL_TYPE_COMPONENT);

ASSERT_TRUE(extension);

- ASSERT_EQ(extension->location(), Extension::COMPONENT);

+ ASSERT_EQ(extension->location(), Manifest::COMPONENT);

CheckPluginsCreated(extension, true);

}

@@ -150,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) {

const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED);

ASSERT_TRUE(extension);

- ASSERT_EQ(extension->location(), Extension::LOAD);

+ ASSERT_EQ(extension->location(), Manifest::LOAD);

CheckPluginsCreated(extension, true);

}