chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc - Issue 10949017: Allow extensions which can run without NPAPI to run under Windows 8 Metro.

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/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

Issue 10949017: Allow extensions which can run without NPAPI to run under Windows 8 Metro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Patch cross-origin-XHR all-URLs test for ChromeOS. Created 8 years, 3 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/common/extensions/extension.cc ('k') | chrome/test/data/extensions/api_test/cross_origin_xhr/all_urls/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

index a428f143cef6056cddd473a8c9693e4f8129d94a..738057f41ff921adf9c4d767dab55885e9217f03 100644

--- a/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

+++ b/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

@@ -66,15 +66,24 @@ TEST_F(ExtensionManifestTest, RequirementsNpapiDefault) {

ASSERT_TRUE(extension.get());

EXPECT_EQ(extension->requirements().webgl, false);

EXPECT_EQ(extension->requirements().css3d, false);

-#if defined(OS_CHROMEOS)

- EXPECT_EQ(extension->requirements().npapi, false);

-#else

EXPECT_EQ(extension->requirements().npapi, true);

-#endif // defined(OS_CHROMEOS)

+ extension = LoadAndExpectSuccess(

+ "requirements_npapi_empty_plugins_empty.json");

+ ASSERT_TRUE(extension.get());

+ EXPECT_EQ(extension->requirements().webgl, false);

+ EXPECT_EQ(extension->requirements().css3d, false);

+ EXPECT_EQ(extension->requirements().npapi, false);

extension = LoadAndExpectSuccess("requirements_npapi.json");

ASSERT_TRUE(extension.get());

EXPECT_EQ(extension->requirements().webgl, false);

EXPECT_EQ(extension->requirements().css3d, false);

EXPECT_EQ(extension->requirements().npapi, false);

+ extension = LoadAndExpectSuccess("requirements_npapi_plugins_empty.json");

+ ASSERT_TRUE(extension.get());

+ EXPECT_EQ(extension->requirements().webgl, false);

+ EXPECT_EQ(extension->requirements().css3d, false);

+ EXPECT_EQ(extension->requirements().npapi, true);

}