Disable NPAPI support

content/browser/plugin_service_impl.cc

Index: content/browser/plugin_service_impl.cc
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 12e7bfa0ea933afa02d841e0f55eef2d404bd318..5e3f194c88f5b1215a1b3cc7ea76037d04c20c50 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -795,16 +795,14 @@ void PluginServiceImpl::GetInternalPlugins(
 }
 
 bool PluginServiceImpl::NPAPIPluginsSupported() {
-  if (npapi_plugins_enabled_)
-    return true;
-
   static bool command_line_checked = false;
 
   if (!command_line_checked) {
 #if defined(OS_WIN) || defined(OS_MACOSX)
     const base::CommandLine* command_line =
         base::CommandLine::ForCurrentProcess();
-    npapi_plugins_enabled_ = command_line->HasSwitch(switches::kEnableNpapi);
+    npapi_plugins_enabled_ =
+        command_line->HasSwitch(switches::kEnableNpapiForTesting);
     NPAPIPluginStatus status =
         npapi_plugins_enabled_ ? NPAPI_STATUS_ENABLED : NPAPI_STATUS_DISABLED;
 #else
@@ -821,18 +819,6 @@ void PluginServiceImpl::DisablePluginsDiscoveryForTesting() {
   PluginList::Singleton()->DisablePluginsDiscovery();
 }
 
-void PluginServiceImpl::EnableNpapiPlugins() {
-#if defined(OS_WIN)
-  DisableWin32kRendererLockdown();
-#endif
-  npapi_plugins_enabled_ = true;
-  RefreshPlugins();
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&PluginService::PurgePluginListCache,
-                 static_cast<BrowserContext*>(NULL), false));
-}
-
 #if defined(OS_MACOSX)
 void PluginServiceImpl::AppActivated() {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,