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

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc	(revision 101981)
+++ chrome/renderer/chrome_content_renderer_client.cc	(working copy)
@@ -391,9 +391,17 @@
         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(
@@ -401,8 +409,8 @@
           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";