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

webkit/support/test_webplugin_page_delegate.h

Index: webkit/support/test_webplugin_page_delegate.h
diff --git a/webkit/support/test_webplugin_page_delegate.h b/webkit/support/test_webplugin_page_delegate.h
index 1b4df8882e440314aa9a1a43dd659ef04278c9c1..95f2b4ab8b51237ef9a82d0d9fd4eb3cee8d3f46 100644
--- a/webkit/support/test_webplugin_page_delegate.h
+++ b/webkit/support/test_webplugin_page_delegate.h
@@ -7,27 +7,26 @@
 
 #include <string>
 
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
-#include "webkit/plugins/npapi/webplugin_page_delegate.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/glue/plugins/webplugin_page_delegate.h"
 
 namespace webkit_support {
 
-class TestWebPluginPageDelegate : public webkit::npapi::WebPluginPageDelegate {
+class TestWebPluginPageDelegate : public webkit_glue::WebPluginPageDelegate {
  public:
   TestWebPluginPageDelegate() {}
   virtual ~TestWebPluginPageDelegate() {}
 
-  virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate(
+  virtual webkit_glue::WebPluginDelegate* CreatePluginDelegate(
       const FilePath& file_path,
       const std::string& mime_type) {
     // We don't need a valid native window handle in layout tests.
     // So just passing 0.
-    return webkit::npapi::WebPluginDelegateImpl::Create(
-        file_path, mime_type, 0);
+    return WebPluginDelegateImpl::Create(file_path, mime_type, 0);
   }
   virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) {}
   virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) {}
-  virtual void DidMovePlugin(const webkit::npapi::WebPluginGeometry& move) {}
+  virtual void DidMovePlugin(const webkit_glue::WebPluginGeometry& move) {}
   virtual void DidStartLoadingForPlugin() {}
   virtual void DidStopLoadingForPlugin() {}
   virtual void ShowModalHTMLDialogForPlugin(
@@ -41,5 +40,4 @@ class TestWebPluginPageDelegate : public webkit::npapi::WebPluginPageDelegate {
 };
 
 }  // namespace webkit_support
-
 #endif  // WEBKIT_SUPPORT_TEST_WEBPLUGIN_PAGE_DELEGATE_H_