Don't block the Native Client plug-in when plug-ins are blocked by content settings.

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 373 matching lines @@
       (plugin_setting == CONTENT_SETTING_ALLOW ||
        plugin_setting == CONTENT_SETTING_ASK) &&
       host_setting == CONTENT_SETTING_DEFAULT) {
     render_view->Send(new ChromeViewHostMsg_BlockedOutdatedPlugin(
         render_view->routing_id(), group->GetGroupName(), GURL()));
     return CreatePluginPlaceholder(
         render_view, frame, params, *group, IDR_BLOCKED_PLUGIN_HTML,
         IDS_PLUGIN_NOT_AUTHORIZED, false, true);
   }
 
-  if (info.path.value() == webkit::npapi::kDefaultPluginLibraryName ||
-      plugin_setting == CONTENT_SETTING_ALLOW ||
-      host_setting == CONTENT_SETTING_ALLOW) {
+  // Treat Native Client invocations like Javascript.
+  bool is_nacl_plugin =
+      info.name == ASCIIToUTF16(ChromeContentClient::kNaClPluginName);
+  if (is_nacl_plugin) {
+    plugin_setting =
+        observer->GetContentSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
+  }
+
+  if (plugin_setting == CONTENT_SETTING_ALLOW ||
+      host_setting == CONTENT_SETTING_ALLOW ||
+      info.path.value() == webkit::npapi::kDefaultPluginLibraryName) {

[Bernhard Bauer, 2011/09/23 08:26:08]

Uh, if NaCl is blocked here, we will show the blocked plug-in icon in the
omnibox, and the bubble there will change the plug-in content settings, not the
javascript ones (so it wouldn't even be possible to whitelist a site from the
UI).

     // 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)) {
+    // Enforce the Chrome WebStore restriction on the Native Client plugin.
+    if (is_nacl_plugin) {
       bool allow_nacl = cmd->HasSwitch(switches::kEnableNaCl);
       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
@@ skipping 348 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