Disable NaCl on 32-bit linux, also disable NaCl extension/store tests for that platform.

BUG=93165
TEST=manual

re-roll of http://codereview.chromium.org/7670055/, was reverted because tests weren't disabled.

Review URL: http://codereview.chromium.org/7621068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97440 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 24 insertions, 6 deletions

diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc
index da5786fc..ebce70f 100644
--- a/chrome/browser/extensions/extension_nacl_browsertest.cc
+++ b/chrome/browser/extensions/extension_nacl_browsertest.cc
@@ -93,7 +93,12 @@ 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);
@@ -111,7 +116,12 @@ 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);
@@ -121,7 +131,12 @@ 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);
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 25ae18d..c18df0d 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -101,9 +101,6 @@ using WebKit::WebVector;
 
 namespace {
 
-const char* kNaClPluginMimeType = "application/x-nacl";
-const char* kNaClPluginManifestAttribute = "nacl";
-
 // Constants for UMA statistic collection.
 static const char kPluginTypeMismatch[] = "Plugin.PluginTypeMismatch";
 static const char kApplicationOctetStream[] = "application/octet-stream";
@@ -403,7 +400,12 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl(
     // Enforce Chrome WebStore restriction on the Native Client plugin.
     if (info.name == ASCIIToUTF16(ChromeContentClient::kNaClPluginName)) {
       bool allow_nacl = cmd->HasSwitch(switches::kEnableNaCl);
+      // TODO(elijahtaylor) Remove this #if when crbug.com/92964 is fixed.
+#if !(defined(OS_LINUX) && ARCH_CPU_32_BITS)
       if (!allow_nacl) {
+        const char* kNaClPluginMimeType = "application/x-nacl";
+        const char* kNaClPluginManifestAttribute = "nacl";
+
         GURL nexe_url;
         if (actual_mime_type == kNaClPluginMimeType) {
           nexe_url = url;  // Normal embedded NaCl plugin.
@@ -437,6 +439,7 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl(
             extension->location() == Extension::COMPONENT ||
             extension->location() == Extension::LOAD);
       }
+#endif // !(defined(OS_LINUX) && ARCH_CPU_32_BITS)
 
       if (!allow_nacl) {
         // TODO(bbudge) Webkit will crash if this is a full-frame plug-in and
diff --git a/chrome/test/data/extensions/native_client/test.html b/chrome/test/data/extensions/native_client/test.html
index f2180c7..e887a8a 100644
--- a/chrome/test/data/extensions/native_client/test.html
+++ b/chrome/test/data/extensions/native_client/test.html
@@ -39,6 +39,9 @@ the plugin was created or blocked in either case.
 
 </head>
 <body>
+  <script>
+      setListeners(document.body);
+  </script>
   <embed id="embedded"
          class="naclModule"
          type="application/x-nacl"
@@ -49,8 +52,5 @@ the plugin was created or blocked in either case.
          type="application/pdf"
          src="test.pdf">
   </embed>
-  <script>
-      setListeners(document.body);
-  </script>
 </body>
 </html>