Index: chrome/renderer/chrome_content_renderer_client.cc |
=================================================================== |
--- chrome/renderer/chrome_content_renderer_client.cc (revision 97322) |
+++ chrome/renderer/chrome_content_renderer_client.cc (working copy) |
@@ -98,6 +98,9 @@ |
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"; |
@@ -397,12 +400,7 @@ |
// 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. |
@@ -436,7 +434,6 @@ |
extension->location() == Extension::COMPONENT || |
extension->location() == Extension::LOAD); |
} |
-#endif // !(Linux 32-bit) |
if (!allow_nacl) { |
// TODO(bbudge) Webkit will crash if this is a full-frame plug-in and |