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

webkit/tools/test_shell/mac/test_webview_delegate.mm

 // Copyright (c) 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 "webkit/tools/test_shell/test_webview_delegate.h"
 
 #import <Cocoa/Cocoa.h>
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webcursor.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webmenurunner_mac.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebPopupMenu;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
 using WebKit::WebWidget;
 
 // WebViewClient --------------------------------------------------------------
@@ skipping 134 matching lines @@
   }
   return gfx::Rect(NSRectToCGRect(resize_rect));
 }
 
 void TestWebViewDelegate::runModal() {
   NOTIMPLEMENTED();
 }
 
 // WebPluginPageDelegate ------------------------------------------------------
 
-webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
+webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     const FilePath& path,
     const std::string& mime_type) {
   WebWidgetHost *host = GetWidgetHost();
   if (!host)
     return NULL;
 
   gfx::PluginWindowHandle containing_view = NULL;
-  return webkit::npapi::WebPluginDelegateImpl::Create(
-      path, mime_type, containing_view);
+  return WebPluginDelegateImpl::Create(path, mime_type, containing_view);
 }
 
 void TestWebViewDelegate::CreatedPluginWindow(
     gfx::PluginWindowHandle handle) {
 }
 
 void TestWebViewDelegate::WillDestroyPluginWindow(
     gfx::PluginWindowHandle handle) {
 }
 
 void TestWebViewDelegate::DidMovePlugin(
-    const webkit::npapi::WebPluginGeometry& move) {
+    const webkit_glue::WebPluginGeometry& move) {
   // TODO(port): add me once plugins work.
 }
 
 // Public methods -------------------------------------------------------------
 
 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
   // No selection clipboard on mac, do nothing.
 }
 
 // Private methods ------------------------------------------------------------
@@ skipping 12 matching lines @@
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:WideToUTF8(title).c_str()]];
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   const char* frameURL = url.spec().c_str();
   NSString *address = [NSString stringWithUTF8String:frameURL];
   [shell_->editWnd() setStringValue:address];
 }