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

Don't block the Native Client plug-in when plug-ins are blocked by content settings.
Instead, allow Native Client when Javascript is allowed.
BUG=91571
TEST=manual

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=102226

[jam, 2011-09-21 21:00:46]

lgtm

[commit-bot: I haz the power, 2011-09-22 02:26:51]

Change committed as 102226

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

Post-commit drive-by review! :-)

http://codereview.chromium.org/7978037/diff/1/chrome/renderer/chrome_content_...
File chrome/renderer/chrome_content_renderer_client.cc (right):

http://codereview.chromium.org/7978037/diff/1/chrome/renderer/chrome_content_...
chrome/renderer/chrome_content_renderer_client.cc:404: info.path.value() ==
webkit::npapi::kDefaultPluginLibraryName) {
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).

[bbudge, 2011-09-23 18:34:00]

I'm not sure I understand the problem. We want to use Javascript content
settings to control whether NaCl can run, with the master control being whether
the user has disabled the plugin in about:plugins. I tested the following cases
manually:

1) All plug-ins blocked. NaCl plug-in NOT blocked.
2) All Javascript blocked. NaCl plug-in blocked.
3) All Javascript blocked, with origin exception. NaCl plug-in from that origin
not blocked, all others blocked.
4) User has disabled NaCl in about:plugins. NaCl plug-in blocked.

On 2011/09/23 08:26:08, Bernhard Bauer wrote:
> Post-commit drive-by review! :-)
> 
>
http://codereview.chromium.org/7978037/diff/1/chrome/renderer/chrome_content_...
> File chrome/renderer/chrome_content_renderer_client.cc (right):
> 
>
http://codereview.chromium.org/7978037/diff/1/chrome/renderer/chrome_content_...
> chrome/renderer/chrome_content_renderer_client.cc:404: info.path.value() ==
> webkit::npapi::kDefaultPluginLibraryName) {
> 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).

[Bernhard Bauer, 2011-09-24 01:36:08]

Yes, but the UI that shows when NaCl is blocked is the one for blocked
plug-ins, not the one for blocked Javascript. When you click on the
blocked plug-in icon in the omnibox, you can add an exception for
plug-ins, but you would need to add one for Javascript to whitelist
the current site.

In end effect, all you need to do is call the DidBlockContent method
with CONTENT_TYPE_JAVASCRIPT instead of CONTENT_TYPE_PLUGINS when NaCl
has been blocked.

On Fri, Sep 23, 2011 at 20:34,  <bbudge@chromium.org> wrote:
> I'm not sure I understand the problem. We want to use Javascript content
> settings to control whether NaCl can run, with the master control being
> whether
> the user has disabled the plugin in about:plugins. I tested the following
> cases
> manually:
>
> 1) All plug-ins blocked. NaCl plug-in NOT blocked.
> 2) All Javascript blocked. NaCl plug-in blocked.
> 3) All Javascript blocked, with origin exception. NaCl plug-in from that
> origin
> not blocked, all others blocked.
> 4) User has disabled NaCl in about:plugins. NaCl plug-in blocked.
>
> On 2011/09/23 08:26:08, Bernhard Bauer wrote:
>>
>> Post-commit drive-by review! :-)
>
>
>
http://codereview.chromium.org/7978037/diff/1/chrome/renderer/chrome_content_...
>>
>> File chrome/renderer/chrome_content_renderer_client.cc (right):
>
>
>
http://codereview.chromium.org/7978037/diff/1/chrome/renderer/chrome_content_...
>>
>> chrome/renderer/chrome_content_renderer_client.cc:404: info.path.value()
>> ==
>> webkit::npapi::kDefaultPluginLibraryName) {
>> 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).
>
>
>
> http://codereview.chromium.org/7978037/
>