Disable NPAPI support

chrome/browser/content_settings/content_settings_browsertest.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
@@ skipping 309 matching lines @@
 #if defined(OS_MACOSX)
     base::FilePath plugin_dir;
     PathService::Get(base::DIR_MODULE, &plugin_dir);
     plugin_dir = plugin_dir.AppendASCII("plugins");
     // The plugins directory isn't read by default on the Mac, so it needs to be
     // explicitly registered.
     command_line->AppendSwitchPath(switches::kExtraPluginDir, plugin_dir);
 #endif
     command_line->AppendSwitch(switches::kAlwaysAuthorizePlugins);
     if (expect_loaded)
-      command_line->AppendSwitch(switches::kEnableNpapi);
+      command_line->AppendSwitch(switches::kEnableNpapiForTesting);
   }
 };
 
 class DisabledPluginTest : public LoadPluginTest {
  public:
   DisabledPluginTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     SetUpCommandLineInternal(command_line, false);
   }
@@ skipping 22 matching lines @@
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
 #if defined(OS_MACOSX)
     base::FilePath plugin_dir;
     PathService::Get(base::DIR_MODULE, &plugin_dir);
     plugin_dir = plugin_dir.AppendASCII("plugins");
     // The plugins directory isn't read by default on the Mac, so it needs to be
     // explicitly registered.
     command_line->AppendSwitchPath(switches::kExtraPluginDir, plugin_dir);
 #endif
-    command_line->AppendSwitch(switches::kEnableNpapi);
+    command_line->AppendSwitch(switches::kEnableNpapiForTesting);

[jam, 2015/05/28 19:22:38]

just delete these two tests

   }
 };
 
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));
   ui_test_utils::NavigateToURL(browser(), url);
@@ skipping 412 matching lines @@
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshBrowserTests))
     return;
 #endif
   RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
 }
 #endif  // !defined(DISABLE_NACL)
 
 #endif  // defined(ENABLE_PLUGINS)