Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index 921c14d2f77a5cc5ee7a8a0b20c7e91beb8ee7a9..858d5ade02c207430a28d846da4c320cc691149f 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -406,8 +406,6 @@ 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"; |
@@ -445,7 +443,6 @@ 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 |