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

webkit/tools/test_shell/test_webview_delegate_gtk.cc

 // 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.
 
 // This file was forked off the Mac port.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "chrome/common/page_transition_types.h"
 #include "gfx/gtk_util.h"
 #include "gfx/point.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/gtk_plugin_container_manager.h"
+#include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/window_open_disposition.h"
-#include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebFrame;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
 using WebKit::WebWidget;
 using WebKit::WebView;
@@ skipping 147 matching lines @@
   // Not necessary on Linux.
   return WebRect();
 }
 
 void TestWebViewDelegate::runModal() {
   NOTIMPLEMENTED();
 }
 
 // WebPluginPageDelegate ------------------------------------------------------
 
-webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
+webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     const FilePath& path,
     const std::string& mime_type) {
   // TODO(evanm): we probably shouldn't be doing this mapping to X ids at
   // this level.
   GdkNativeWindow plugin_parent =
       GDK_WINDOW_XWINDOW(shell_->webViewHost()->view_handle()->window);
 
-  return webkit::npapi::WebPluginDelegateImpl::Create(
-      path, mime_type, plugin_parent);
+  return WebPluginDelegateImpl::Create(path, mime_type, plugin_parent);
 }
 
 void TestWebViewDelegate::CreatedPluginWindow(
     gfx::PluginWindowHandle id) {
   shell_->webViewHost()->CreatePluginContainer(id);
 }
 
 void TestWebViewDelegate::WillDestroyPluginWindow(
     gfx::PluginWindowHandle id) {
   shell_->webViewHost()->DestroyPluginContainer(id);
 }
 
 void TestWebViewDelegate::DidMovePlugin(
-    const webkit::npapi::WebPluginGeometry& move) {
+    const webkit_glue::WebPluginGeometry& move) {
   WebWidgetHost* host = GetWidgetHost();
-  webkit::npapi::GtkPluginContainerManager* plugin_container_manager =
+  GtkPluginContainerManager* plugin_container_manager =
       static_cast<WebViewHost*>(host)->plugin_container_manager();
   plugin_container_manager->MovePluginContainer(move);
 }
 
 // Public methods -------------------------------------------------------------
 
 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
   if (is_empty_selection)
     return;
 
@@ skipping 26 matching lines @@
 }
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
                        ("Test Shell - " + WideToUTF8(title)).c_str());
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str());
 }