diff options
| author | wfh <wfh@chromium.org> | 2015-05-29 10:56:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 17:56:57 +0000 |
| commit | cfdd80f3d2a845a2267dd9ffe81011609f74eb0c (patch) | |
| tree | 2ff88ec066e34c2c701a59509525402975c058a6 /chrome/browser/content_settings | |
| parent | c1995be807fd95a833d93eef029a8642782b0d6e (diff) | |
| download | chromium_src-cfdd80f3d2a845a2267dd9ffe81011609f74eb0c.zip chromium_src-cfdd80f3d2a845a2267dd9ffe81011609f74eb0c.tar.gz chromium_src-cfdd80f3d2a845a2267dd9ffe81011609f74eb0c.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1158423003
Cr-Commit-Position: refs/heads/master@{#332006}
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 1fb1785..8115527 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -327,7 +327,7 @@ class LoadPluginTest : public ContentSettingsTest { #endif command_line->AppendSwitch(switches::kAlwaysAuthorizePlugins); if (expect_loaded) - command_line->AppendSwitch(switches::kEnableNpapi); + command_line->AppendSwitch(switches::kEnableNpapiForTesting); } }; @@ -370,7 +370,7 @@ class ClickToPlayPluginTest : public ContentSettingsTest { // explicitly registered. command_line->AppendSwitchPath(switches::kExtraPluginDir, plugin_dir); #endif - command_line->AppendSwitch(switches::kEnableNpapi); + command_line->AppendSwitch(switches::kEnableNpapiForTesting); } }; |