Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/browser/hang_monitor/hung_plugin_action.cc

Index: chrome/browser/hang_monitor/hung_plugin_action.cc
diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc
index 839946439132df684ae7f1e796c84b84e4f25652..9b719ca45d8fc63f8cb2fa0a0b7b24937fd4f6fc 100644
--- a/chrome/browser/hang_monitor/hung_plugin_action.cc
+++ b/chrome/browser/hang_monitor/hung_plugin_action.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/platform_util.h"
 #include "chrome/common/logging_chrome.h"
 #include "grit/generated_resources.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 HungPluginAction::HungPluginAction() : current_hung_plugin_window_(NULL) {
 }
@@ -122,8 +122,8 @@ bool HungPluginAction::GetPluginName(HWND plugin_window,
       // we have gone too far.
       return false;
     }
-    if (WebPluginDelegateImpl::GetPluginNameFromWindow(window_to_check,
-                                                       plugin_name)) {
+    if (webkit::npapi::WebPluginDelegateImpl::GetPluginNameFromWindow(
+            window_to_check, plugin_name)) {
       return true;
     }
     window_to_check = GetParent(window_to_check);