Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/plugin/webplugin_delegate_stub.cc

 // Copyright (c) 2012 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 "content/plugin/webplugin_delegate_stub.h"
 
 #include "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
+#include "content/child/npapi/plugin_instance.h"
+#include "content/child/npapi/webplugin_delegate_impl.h"
 #include "content/child/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/plugin/webplugin_proxy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 #include "third_party/WebKit/public/web/WebCursorInfo.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "webkit/common/cursors/webcursor.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
-using webkit::npapi::WebPlugin;
-using webkit::npapi::WebPluginResourceClient;
 
 namespace content {
 
 static void DestroyWebPluginAndDelegate(
     base::WeakPtr<NPObjectStub> scriptable_object,
-    webkit::npapi::WebPluginDelegateImpl* delegate,
+    WebPluginDelegateImpl* delegate,
     WebPlugin* webplugin) {
   // The plugin may not expect us to try to release the scriptable object
   // after calling NPP_Destroy on the instance, so delete the stub now.
   if (scriptable_object.get())
     scriptable_object->DeleteSoon();
 
   if (delegate) {
     // Save the object owner Id so we can unregister it as a valid owner
     // after the instance has been destroyed.
     NPP owner = delegate->GetPluginNPP();
@@ skipping 127 matching lines @@
   }
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   base::FilePath path =
       command_line.GetSwitchValuePath(switches::kPluginPath);
 
   webplugin_ = new WebPluginProxy(channel_.get(),
                                   instance_id_,
                                   page_url_,
                                   params.host_render_view_routing_id);
-  delegate_ = webkit::npapi::WebPluginDelegateImpl::Create(path, mime_type_);
+  delegate_ = WebPluginDelegateImpl::Create(path, mime_type_);
   if (delegate_) {
     webplugin_->set_delegate(delegate_);
     std::vector<std::string> arg_names = params.arg_names;
     std::vector<std::string> arg_values = params.arg_values;
 
     // Register the plugin as a valid object owner.
     WebBindings::registerObjectOwner(delegate_->GetPluginNPP());
 
     // Add an NPObject owner mapping for this instance, to support ownership
     // tracking in the renderer.
@@ skipping 217 matching lines @@
 }
 
 void WebPluginDelegateStub::OnHTTPRangeRequestReply(
     unsigned long resource_id, int range_request_id) {
   WebPluginResourceClient* resource_client =
       delegate_->CreateSeekableResourceClient(resource_id, range_request_id);
   webplugin_->OnResourceCreated(resource_id, resource_client);
 }
 
 }  // namespace content