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

chrome/browser/hang_monitor/hung_plugin_action.cc

 // Copyright (c) 2006-2008 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 "app/l10n_util.h"
 #include "app/win_util.h"
 #include "base/win_util.h"
 #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) {
 }
 
 HungPluginAction::~HungPluginAction() {
 }
 
 bool HungPluginAction::OnHungWindowDetected(HWND hung_window,
                                             HWND top_level_window,
                                             ActionOnHungWindow* action) {
@@ skipping 89 matching lines @@
   DCHECK(plugin_name);
   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 (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);
   }
   return false;
 }
 
 // static
 BOOL CALLBACK HungPluginAction::DismissMessageBox(HWND window, LPARAM ignore) {
   std::wstring class_name = win_util::GetClassNameW(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);
   }
 }