From d2c513cedd908259fa3a9c9d0aac79d4edffae99 Mon Sep 17 00:00:00 2001
From: "bradchen@google.com"
 <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 2 Sep 2011 04:24:37 +0000
Subject: Enable nacl_helper by default.

BUG=92964,nativeclient:480
TEST=nacl_integration in chromium bots


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99319 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/renderer/chrome_content_renderer_client.cc | 3 ---
 1 file changed, 3 deletions(-)

(limited to '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 921c14d..858d5ad 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
-- 
cgit v1.1