Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin...

webkit/tools/test_shell/test_webview_delegate_win.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 contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <objidl.h>
 #include <shlobj.h>
 #include <shlwapi.h>
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/gdi_util.h"
 #include "gfx/point.h"
 #include "net/base/net_errors.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/WebView.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/window_open_disposition.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/drag_delegate.h"
 #include "webkit/tools/test_shell/drop_delegate.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
 using WebKit::WebWidget;
@@ skipping 83 matching lines @@
 
   shell_->set_is_modal(true);
   MessageLoop::current()->Run();
 
   for (WindowList::const_iterator i = wl->begin(); i != wl->end(); ++i)
     EnableWindow(*i, TRUE);
 }
 
 // WebPluginPageDelegate ------------------------------------------------------
 
-webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
+webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     const FilePath& path,
     const std::string& mime_type) {
   HWND hwnd = shell_->webViewHost()->view_handle();
   if (!hwnd)
     return NULL;
 
-  return webkit::npapi::WebPluginDelegateImpl::Create(path, mime_type, hwnd);
+  return WebPluginDelegateImpl::Create(path, mime_type, hwnd);
 }
 
 void TestWebViewDelegate::CreatedPluginWindow(
     gfx::PluginWindowHandle handle) {
   // ignored
 }
 
 void TestWebViewDelegate::WillDestroyPluginWindow(
     gfx::PluginWindowHandle handle) {
   // ignored
 }
 
 void TestWebViewDelegate::DidMovePlugin(
-    const webkit::npapi::WebPluginGeometry& move) {
+    const webkit_glue::WebPluginGeometry& move) {
   unsigned long flags = 0;
 
   if (move.rects_valid) {
     HRGN hrgn = ::CreateRectRgn(move.clip_rect.x(),
                                 move.clip_rect.y(),
                                 move.clip_rect.right(),
                                 move.clip_rect.bottom());
     gfx::SubtractRectanglesFromRegion(hrgn, move.cutout_rects);
 
     // Note: System will own the hrgn after we call SetWindowRgn,
@@ skipping 31 matching lines @@
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   // The Windows test shell, pre-refactoring, ignored this.  *shrug*
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   std::wstring url_string = UTF8ToWide(url.spec());
   SendMessage(shell_->editWnd(), WM_SETTEXT, 0,
               reinterpret_cast<LPARAM>(url_string.c_str()));
 }