Disable NPAPI support by removing the --enable-npapi switch, chrome://flags and enterprise policy override.
--enable-npapi-for-testing will remain temporarily until the rest of the NPAPI code and tests are removed.
This is a selective revert of 0539f2f5214fc17fdd5d1964be0ceedf98fdb9ce and 26d09db19381c2236a2890c045761465c78bc958.
BUG=493212, 489066
Committed: https://crrev.com/cfdd80f3d2a845a2267dd9ffe81011609f74eb0c
Cr-Commit-Position: refs/heads/master@{#332006}

On 2015/05/28 19:59:35, jam wrote:
> lgtm
Context as we spoke offline: the --enable-npapi-for-testing flag has to remain
because content_shell needs it for the webkit tests (which will be removed in a
later CL) so we agreed to leave all the test removal until a follow-up CL.