Remove NPAPI command line flags entirely.

content/browser/plugin_service_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 776 matching lines @@
 void PluginServiceImpl::UnregisterInternalPlugin(const base::FilePath& path) {
   PluginList::Singleton()->UnregisterInternalPlugin(path);
 }
 
 void PluginServiceImpl::GetInternalPlugins(
     std::vector<WebPluginInfo>* plugins) {
   PluginList::Singleton()->GetInternalPlugins(plugins);
 }
 
 bool PluginServiceImpl::NPAPIPluginsSupported() {
-  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::kEnableNpapiForTesting);
+  npapi_plugins_enabled_ =
+      content::GetContentClient()->browser()->IsNPAPIEnabled();

[jam, 2015/07/20 16:36:22]

nit: no content::

[Will Harris, 2015/07/20 16:54:50]

Done, also below where I stole this from :)

 #if defined(OS_WIN)
-    // NPAPI plugins don't play well with Win32k renderer lockdown.
-    if (npapi_plugins_enabled_)
-      DisableWin32kRendererLockdown();
+  // NPAPI plugins don't play well with Win32k renderer lockdown.
+  if (npapi_plugins_enabled_)
+    DisableWin32kRendererLockdown();
 #endif
-    NPAPIPluginStatus status =
-        npapi_plugins_enabled_ ? NPAPI_STATUS_ENABLED : NPAPI_STATUS_DISABLED;
+  NPAPIPluginStatus status =
+      npapi_plugins_enabled_ ? NPAPI_STATUS_ENABLED : NPAPI_STATUS_DISABLED;
 #else
-    NPAPIPluginStatus status = NPAPI_STATUS_UNSUPPORTED;
+  NPAPIPluginStatus status = NPAPI_STATUS_UNSUPPORTED;
 #endif
-    UMA_HISTOGRAM_ENUMERATION("Plugin.NPAPIStatus", status,
-        NPAPI_STATUS_ENUM_COUNT);
-  }
+  UMA_HISTOGRAM_ENUMERATION("Plugin.NPAPIStatus", status,
+                            NPAPI_STATUS_ENUM_COUNT);
 
   return npapi_plugins_enabled_;
 }
 
 void PluginServiceImpl::DisablePluginsDiscoveryForTesting() {
   PluginList::Singleton()->DisablePluginsDiscovery();
 }
 
 #if defined(OS_MACOSX)
 void PluginServiceImpl::AppActivated() {
@@ skipping 43 matching lines @@
 #endif
 
 bool PluginServiceImpl::PpapiDevChannelSupported(
     BrowserContext* browser_context,
     const GURL& document_url) {
   return content::GetContentClient()->browser()->
       IsPluginAllowedToUseDevChannelAPIs(browser_context, document_url);
 }
 
 }  // namespace content