Remove webkit/plugins/npapi.

chrome/browser/hang_monitor/hung_plugin_action.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 <windows.h>
 
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 
 #include "base/metrics/histogram.h"
 #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 {
 
 const wchar_t kGTalkPluginName[] = L"Google Talk Plugin";
 const int kGTalkPluginLogMinVersion = 26;  // For version 2.6 and below.
 
 enum GTalkPluginLogVersion {
   GTALK_PLUGIN_VERSION_MIN = 0,
   GTALK_PLUGIN_VERSION_27,
   GTALK_PLUGIN_VERSION_28,
   GTALK_PLUGIN_VERSION_29,
   GTALK_PLUGIN_VERSION_30,
   GTALK_PLUGIN_VERSION_31,
   GTALK_PLUGIN_VERSION_32,
   GTALK_PLUGIN_VERSION_33,
   GTALK_PLUGIN_VERSION_34,
   GTALK_PLUGIN_VERSION_MAX
 };
 
 // Converts the version string of Google Talk Plugin to a version enum. The
 // version format is "major(1 digit).minor(1 digit).sub(1 or 2 digits)",
 // for example, "2.7.10" and "2.8.1". Converts the string to a number as
 // 10 * major + minor - kGTalkPluginLogMinVersion.
 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;
   }
 
   if (gtalk_plugin_version < GTALK_PLUGIN_VERSION_MIN)
     return GTALK_PLUGIN_VERSION_MIN;
   if (gtalk_plugin_version > GTALK_PLUGIN_VERSION_MAX)
     return GTALK_PLUGIN_VERSION_MAX;
   return static_cast<GTalkPluginLogVersion>(gtalk_plugin_version);
@@ skipping 113 matching lines @@
   DCHECK(plugin_version);
   HWND window_to_check = plugin_window;
   while (NULL != window_to_check) {
     DWORD process_id = 0;
     GetWindowThreadProcessId(window_to_check, &process_id);
     if (process_id == browser_process_id) {
       // If we have reached a window the that belongs to the browser process
       // 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);
   }
   return false;
 }
 
 // static
 BOOL CALLBACK HungPluginAction::DismissMessageBox(HWND window, LPARAM ignore) {
   string16 class_name = ui::GetClassName(window);
@@ skipping 10 matching lines @@
 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window,
                                                            UINT message,
                                                            ULONG_PTR data,
                                                            LRESULT result) {
   HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data);
   DCHECK(NULL != instance);
   if (NULL != instance) {
     instance->OnWindowResponsive(target_window);
   }
 }