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

chrome/plugin/webplugin_delegate_stub.cc

Index: chrome/plugin/webplugin_delegate_stub.cc
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index ff0652d3098aeb1a87a71b7600fe8fe4f26f78d6..0540adf4ad3c05ec8dc6e82e643ed800c5be16da 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -20,7 +20,7 @@
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
 
 #if defined(ENABLE_GPU)
@@ -29,13 +29,15 @@
 
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
-using webkit_glue::WebPlugin;
-using webkit_glue::WebPluginResourceClient;
+using webkit::npapi::WebPlugin;
+using webkit::npapi::WebPluginResourceClient;
 
 class FinishDestructionTask : public Task {
  public:
-  FinishDestructionTask(WebPluginDelegateImpl* delegate, WebPlugin* webplugin)
-    : delegate_(delegate), webplugin_(webplugin) { }
+  FinishDestructionTask(webkit::npapi::WebPluginDelegateImpl* delegate,
+                        WebPlugin* webplugin)
+      : delegate_(delegate), webplugin_(webplugin) {
+  }
 
   void Run() {
     // WebPlugin must outlive WebPluginDelegate.
@@ -46,8 +48,8 @@ class FinishDestructionTask : public Task {
   }
 
  private:
-  WebPluginDelegateImpl* delegate_;
-  WebPlugin* webplugin_;
+  webkit::npapi::WebPluginDelegateImpl* delegate_;
+  webkit::npapi::WebPlugin* webplugin_;
 };
 
 WebPluginDelegateStub::WebPluginDelegateStub(
@@ -185,7 +187,8 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
   webplugin_ = new WebPluginProxy(
       channel_, instance_id_, page_url_, params.containing_window,
       params.host_render_view_routing_id);
-  delegate_ = WebPluginDelegateImpl::Create(path, mime_type_, parent);
+  delegate_ = webkit::npapi::WebPluginDelegateImpl::Create(
+      path, mime_type_, parent);
   if (delegate_) {
     webplugin_->set_delegate(delegate_);
     *result = delegate_->Initialize(params.url,