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

Unified Diff: chrome/browser/extensions/plugin_apitest.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/app/generated_resources.grd ('k') | chrome/browser/extensions/requirements_checker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/plugin_apitest.cc
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc
index ad856318a44fe416f0ad630aa9e031c3bd7277d5..42d2eb4f89b5dcf885765896fa13639f357cbba7 100644
--- a/chrome/browser/extensions/plugin_apitest.cc
+++ b/chrome/browser/extensions/plugin_apitest.cc
@@ -88,12 +88,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
}
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result));
- // We don't allow extension plugins to run on ChromeOS.
- #if defined(OS_CHROMEOS)
- EXPECT_FALSE(result);
- #else
- EXPECT_TRUE(result);
- #endif
+ // We don't allow extension plugins to run on ChromeOS.
+#if defined(OS_CHROMEOS)
+ EXPECT_FALSE(result);
+#else
+ EXPECT_TRUE(result);
+#endif
}
// Tests that private extension plugins are only visible to the extension.
@@ -135,6 +135,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) {
CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result));
+ // We don't allow extension plugins to run on ChromeOS.
#if defined(OS_CHROMEOS)
EXPECT_FALSE(result);
#else
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/requirements_checker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698