Remove webkit/plugins/npapi.

chrome/browser/extensions/plugin_apitest.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/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
-#include "webkit/plugins/npapi/plugin_utils.h"
 
 using content::NavigationController;
 using content::WebContents;
 using extensions::Extension;
 
 #if defined(OS_WIN)
 // http://crbug.com/123851 : test flakily fails on win.
 #define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload
 #elif defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
 // ExtensionBrowserTest.PluginLoadUnload started failing after the switch to
 // dynamic ASan runtime library on Mac. See http://crbug.com/234591.
 #define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux http://crbug.com/238460
 #define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload
 #else
 #define MAYBE_PluginLoadUnload PluginLoadUnload
 #endif
 
 // Tests that a renderer's plugin list is properly updated when we load and
 // unload an extension that contains a plugin.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {
-  if (!webkit::npapi::NPAPIPluginsSupported())
+  if (!content::PluginService::GetInstance()->NPAPIPluginsSupported())
     return;
   browser()->profile()->GetPrefs()->SetBoolean(prefs::kPluginsAlwaysAuthorize,
                                                true);
 
   base::FilePath extension_dir =
       test_data_dir_.AppendASCII("uitest").AppendASCII("plugins");
 
   ui_test_utils::NavigateToURL(browser(),
       net::FilePathToFileURL(extension_dir.AppendASCII("test.html")));
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 62 matching lines @@
 // Timing out on ARM linux http://crbug.com/238467
 #define MAYBE_PluginPrivate DISABLED_PluginPrivate
 #elif defined(OS_WIN) && defined(ARCH_CPU_X86_64)
 // TODO(jschuh): Failing plugin tests. crbug.com/244653
 #define MAYBE_PluginPrivate DISABLED_PluginPrivate
 #else
 #define MAYBE_PluginPrivate PluginPrivate
 #endif
 // Tests that private extension plugins are only visible to the extension.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginPrivate) {
-  if (!webkit::npapi::NPAPIPluginsSupported())
+  if (!content::PluginService::GetInstance()->NPAPIPluginsSupported())
     return;
 
   browser()->profile()->GetPrefs()->SetBoolean(prefs::kPluginsAlwaysAuthorize,
                                                true);
 
   base::FilePath extension_dir =
       test_data_dir_.AppendASCII("uitest").AppendASCII("plugins_private");
 
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
@@ skipping 34 matching lines @@
   EXPECT_TRUE(result);
 #endif
 
   // Now load it through a file URL. The plugin should not load.
   ui_test_utils::NavigateToURL(browser(),
       net::FilePathToFileURL(extension_dir.AppendASCII("test.html")));
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       tab, "testPluginWorks()", &result));
   EXPECT_FALSE(result);
 }