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

chrome/plugin/webplugin_delegate_stub.cc

 // Copyright (c) 2009 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 "chrome/plugin/webplugin_delegate_stub.h"
 
 #include "build/build_config.h"
 
 #include "base/command_line.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_stub.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "printing/native_metafile.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #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)
 #include "app/gfx/gl/gl_context.h"
 #endif
 
 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.
     if (delegate_)
       delegate_->PluginDestroyed();
 
     delete webplugin_;
   }
 
  private:
-  WebPluginDelegateImpl* delegate_;
-  WebPlugin* webplugin_;
+  webkit::npapi::WebPluginDelegateImpl* delegate_;
+  webkit::npapi::WebPlugin* webplugin_;
 };
 
 WebPluginDelegateStub::WebPluginDelegateStub(
     const std::string& mime_type, int instance_id, PluginChannel* channel) :
     mime_type_(mime_type),
     instance_id_(instance_id),
     channel_(channel),
     delegate_(NULL),
     webplugin_(NULL),
     in_destructor_(false) {
@@ skipping 117 matching lines @@
   // The problem is that the XID can change at arbitrary times (e.g. when the
   // tab is detached then reattached), so we need to be able to track these
   // changes, and let the PluginInstance know.
   // PluginThread::current()->Send(new PluginProcessHostMsg_MapNativeViewId(
   //    params.containing_window, &parent));
 #endif
 
   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,
                                     params.arg_names,
                                     params.arg_values,
                                     webplugin_,
                                     params.load_manually);
   }
 }
 
@@ skipping 268 matching lines @@
   webplugin_->OnResourceCreated(resource_id, resource_client);
 }
 
 #if defined(OS_MACOSX)
 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle(
     gfx::PluginWindowHandle window) {
   delegate_->set_windowed_handle(window);
 }
 #endif