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

webkit/tools/test_shell/webview_host.h

 // Copyright (c) 2010 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_
 #define WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_
 
 #include "base/basictypes.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "webkit/glue/plugins/gtk_plugin_container_manager.h"
+#include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
 #endif
 
 struct WebPreferences;
 class TestWebViewDelegate;
 
 namespace WebKit {
 class WebDevToolsAgentClient;
 class WebView;
 }
 
@@ skipping 10 matching lines @@
 
   WebKit::WebView* webview() const;
 
 #if defined(TOOLKIT_USES_GTK)
   // Create a new plugin parent container for a given plugin XID.
   void CreatePluginContainer(gfx::PluginWindowHandle id);
 
   // Destroy the plugin parent container when a plugin has been destroyed.
   void DestroyPluginContainer(gfx::PluginWindowHandle id);
 
-  GtkPluginContainerManager* plugin_container_manager() {
+  webkit::npapi::GtkPluginContainerManager* plugin_container_manager() {
     return &plugin_container_manager_;
   }
 #elif defined(OS_MACOSX)
   void SetIsActive(bool active);
 #endif
 
  protected:
 #if defined(OS_WIN)
   virtual bool WndProc(UINT message, WPARAM wparam, LPARAM lparam) {
     return false;
   }
 #endif
 
 #if defined(TOOLKIT_USES_GTK)
   // Helper class that creates and moves plugin containers.
-  GtkPluginContainerManager plugin_container_manager_;
+  webkit::npapi::GtkPluginContainerManager plugin_container_manager_;
 #endif
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_