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

Unified Diff: chrome/browser/extensions/extension_nacl_browsertest.cc

Issue 7821021: Enable nacl_helper by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Eliminate --nacl-linux-helper flag Created 9 years, 4 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 | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 ebce70f9e9a5c1c3d93232d595b47d1e6503b099..dc93bad03fc08fb23c886e879bbed8054155bb51 100644
--- a/chrome/browser/extensions/extension_nacl_browsertest.cc
+++ b/chrome/browser/extensions/extension_nacl_browsertest.cc
@@ -93,12 +93,7 @@ class NaClExtensionTest : public ExtensionBrowserTest {
};
// Test that the NaCl plugin isn't blocked for Webstore extensions.
-// DISABLED http://crbug.com/92964
-#if defined(OS_LINUX) && ARCH_CPU_32_BITS
-IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_WebStoreExtension) {
-#else
IN_PROC_BROWSER_TEST_F(NaClExtensionTest, WebStoreExtension) {
-#endif
ASSERT_TRUE(test_server()->Start());
const Extension* extension = InstallExtension(INSTALL_TYPE_FROM_WEBSTORE);
@@ -116,12 +111,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, NonWebStoreExtension) {
}
// Test that the NaCl plugin isn't blocked for component extensions.
-// DISABLED http://crbug.com/92964
-#if defined(OS_LINUX) && ARCH_CPU_32_BITS
-IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_ComponentExtension) {
-#else
IN_PROC_BROWSER_TEST_F(NaClExtensionTest, ComponentExtension) {
-#endif
ASSERT_TRUE(test_server()->Start());
const Extension* extension = InstallExtension(INSTALL_TYPE_COMPONENT);
@@ -131,12 +121,7 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, ComponentExtension) {
}
// Test that the NaCl plugin isn't blocked for unpacked extensions.
-// DISABLED http://crbug.com/92964
-#if defined(OS_LINUX) && ARCH_CPU_32_BITS
-IN_PROC_BROWSER_TEST_F(NaClExtensionTest, DISABLED_UnpackedExtension) {
-#else
IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) {
-#endif
ASSERT_TRUE(test_server()->Start());
const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED);
@@ -146,4 +131,3 @@ IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) {
}
} // namespace
-
« no previous file with comments | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698