Enable NPAPI plugins if any plugin policies are set.

Enable NPAPI plugins if any plugin policies are set.

Once NPAPI is pushed behind a flag in M42, enterprise polices that are set need to re-enable NPAPI plugins correctly.

This CL covers all the policy cases and is intended to be a wide net to catch any/all policies.  We don't particularly mind if this has a few false positives, because NPAPI will be totally gone soon.

BUG=295137
TEST=Set e.g. EnabledPlugins policy.  Check that NPAPI plugins are listed in chrome://plugins

Committed: https://crrev.com/a79d102fed6a32ad05901ff9eb2fa8b9241639fd
Cr-Commit-Position: refs/heads/master@{#317329}

[Will Harris, 2015-02-19 22:07:06]

wfh@chromium.org changed reviewers:
+ atwilson@chromium.org, jam@chromium.org

[Will Harris, 2015-02-19 22:07:06]

jam@chromium.org: Please review changes in content/

atwilson@chromium.org: Please review changes in chrome/browser/policy/

[jam, 2015-02-19 23:46:48]

lgtm

https://codereview.chromium.org/930243008/diff/80001/chrome/browser/policy/ch...
File chrome/browser/policy/chrome_browser_policy_connector.cc (right):

https://codereview.chromium.org/930243008/diff/80001/chrome/browser/policy/ch...
chrome/browser/policy/chrome_browser_policy_connector.cc:149: const std::string
pluginPolicies[] = { key::kEnabledPlugins,
nit: plugin_policies

https://codereview.chromium.org/930243008/diff/80001/content/browser/plugin_s...
File content/browser/plugin_service_impl.cc (right):

https://codereview.chromium.org/930243008/diff/80001/content/browser/plugin_s...
content/browser/plugin_service_impl.cc:774: DCHECK_NE(info.type,
WebPluginInfo::PLUGIN_TYPE_NPAPI);
nit: i'd make that a CHECK_NE

[Will Harris, 2015-02-20 00:16:13]

New patchsets have been uploaded after l-g-t-m from jam@chromium.org

[Will Harris, 2015-02-20 03:55:50]

done.

atwilson@ PTAL at the policy parts.  Thanks.

https://codereview.chromium.org/930243008/diff/80001/chrome/browser/policy/ch...
File chrome/browser/policy/chrome_browser_policy_connector.cc (right):

https://codereview.chromium.org/930243008/diff/80001/chrome/browser/policy/ch...
chrome/browser/policy/chrome_browser_policy_connector.cc:149: const std::string
pluginPolicies[] = { key::kEnabledPlugins,
On 2015/02/19 23:46:48, jam wrote:
> nit: plugin_policies

Done.

https://codereview.chromium.org/930243008/diff/80001/content/browser/plugin_s...
File content/browser/plugin_service_impl.cc (right):

https://codereview.chromium.org/930243008/diff/80001/content/browser/plugin_s...
content/browser/plugin_service_impl.cc:774: DCHECK_NE(info.type,
WebPluginInfo::PLUGIN_TYPE_NPAPI);
On 2015/02/19 23:46:48, jam wrote:
> nit: i'd make that a CHECK_NE

Done.

[Andrew T Wilson (Slow), 2015-02-20 10:28:27]

lgtm

https://codereview.chromium.org/930243008/diff/100001/chrome/browser/policy/c...
File chrome/browser/policy/chrome_browser_policy_connector.cc (right):

https://codereview.chromium.org/930243008/diff/100001/chrome/browser/policy/c...
chrome/browser/policy/chrome_browser_policy_connector.cc:153:
key::kDisabledPlugins };
I suspect checking DisabledPlugins is not needed here (shouldn't by itself
re-enable NPAPI), but it's fine to leave this in under the goal of "casting a
wide net".

[Will Harris, 2015-02-20 15:12:11]

The CQ bit was checked by wfh@chromium.org

[commit-bot: I haz the power, 2015-02-20 15:12:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/930243008/100001

[commit-bot: I haz the power, 2015-02-20 16:13:25]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2015-02-20 16:14:02]

Patchset 6 (id:??) landed as
https://crrev.com/a79d102fed6a32ad05901ff9eb2fa8b9241639fd
Cr-Commit-Position: refs/heads/master@{#317329}