Remove webkit/plugins/npapi.

chrome/browser/hang_monitor/hung_plugin_action.cc

Index: chrome/browser/hang_monitor/hung_plugin_action.cc
===================================================================
--- chrome/browser/hang_monitor/hung_plugin_action.cc	(revision 212595)
+++ chrome/browser/hang_monitor/hung_plugin_action.cc	(working copy)
@@ -10,10 +10,11 @@
 #include "base/version.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/logging_chrome.h"
+#include "content/public/browser/plugin_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/win/hwnd_util.h"
-#include "webkit/plugins/npapi/plugin_utils.h"
+#include "webkit/plugins/webplugininfo.h"
 
 namespace {
 
@@ -40,7 +41,7 @@
 GTalkPluginLogVersion GetGTalkPluginVersion(const string16& version) {
   int gtalk_plugin_version = GTALK_PLUGIN_VERSION_MIN;
   Version plugin_version;
-  webkit::npapi::CreateVersionFromString(version, &plugin_version);
+  webkit::WebPluginInfo::CreateVersionFromString(version, &plugin_version);
   if (plugin_version.IsValid() && plugin_version.components().size() >= 2) {
     gtalk_plugin_version = 10 * plugin_version.components()[0] +
         plugin_version.components()[1] - kGTalkPluginLogMinVersion;
@@ -174,9 +175,8 @@
       // we have gone too far.
       return false;
     }
-    if (webkit::npapi::GetPluginNameFromWindow(window_to_check, plugin_name)) {
-      webkit::npapi::GetPluginVersionFromWindow(
-          window_to_check, plugin_version);
+    if (content::PluginService::GetInstance()->GetPluginInfoFromWindow(
+            window_to_check, plugin_name, plugin_version)) {
       return true;
     }
     window_to_check = GetParent(window_to_check);