Revert 97285 - Disable NaCl on 32-bit linux

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 80 matching lines @@
 using WebKit::WebPluginParams;
 using WebKit::WebSecurityPolicy;
 using WebKit::WebString;
 using WebKit::WebURLError;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 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";
 enum {
   PLUGIN_TYPE_MISMATCH_NONE = 0,
   PLUGIN_TYPE_MISMATCH_ORIG_EMPTY,
   PLUGIN_TYPE_MISMATCH_ORIG_OCTETSTREAM,
   PLUGIN_TYPE_MISMATCH_ORIG_OTHER,
   PLUGIN_TYPE_MISMATCH_NUM_EVENTS,
 };
@@ skipping 279 matching lines @@
     // Delay loading plugins if prerendering.
     if (prerender::PrerenderHelper::IsPrerendering(render_view)) {
       return CreatePluginPlaceholder(
           render_view, frame, params, *group, IDR_CLICK_TO_PLAY_PLUGIN_HTML,
           IDS_PLUGIN_LOAD, true, true);
     }
 
     // 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.
         } else {
           // Content type handling NaCl plugin; the "nacl" param on the
           // MIME type holds the nexe URL.
           string16 nacl_attr = ASCIIToUTF16(kNaClPluginManifestAttribute);
           for (size_t i = 0; i < info.mime_types.size(); ++i) {
             if (info.mime_types[i].mime_type == actual_mime_type) {
               const webkit::WebPluginMimeType& content_type =
@@ skipping 13 matching lines @@
         // Create the NaCl plugin only if the .nexe is part of an extension
         // that was installed from the Chrome Web Store, or part of a component
         // extension, or part of an unpacked extension.
         const Extension* extension =
             extension_dispatcher_->extensions()->GetByURL(nexe_url);
         allow_nacl = extension &&
             (extension->from_webstore() ||
             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
         // we return NULL. Prepare a patch to fix that, and return NULL here.
         return CreatePluginPlaceholder(
             render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML,
             IDS_PLUGIN_BLOCKED, false, false);
       }
     }
 
@@ skipping 267 matching lines @@
   if (spellcheck_.get())
     thread->RemoveObserver(spellcheck_.get());
   SpellCheck* new_spellcheck = new SpellCheck();
   if (spellcheck_provider_)
     spellcheck_provider_->SetSpellCheck(new_spellcheck);
   spellcheck_.reset(new_spellcheck);
   thread->AddObserver(new_spellcheck);
 }
 
 }  // namespace chrome