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

content/child/npobject_proxy.cc

 // Copyright 2013 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/child/npobject_proxy.h"
 
 #include "content/child/np_channel_base.h"
+#include "content/child/npapi/plugin_host.h"
+#include "content/child/npapi/plugin_instance.h"
 #include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
-#include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_host.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
 
 using WebKit::WebBindings;
 
 namespace content {
 
 struct NPObjectWrapper {
     NPObject object;
     NPObjectProxy* proxy;
 };
 
@@ skipping 359 matching lines @@
   proxy->Send(new NPObjectMsg_Enumeration(
       proxy->route_id(), &value_param, &result));
   // Send may delete proxy.
   proxy = NULL;
 
   if (!result)
     return false;
 
   *count = static_cast<unsigned int>(value_param.size());
   *value = static_cast<NPIdentifier *>(
-      webkit::npapi::PluginHost::Singleton()->host_functions()->memalloc(
+      PluginHost::Singleton()->host_functions()->memalloc(
           sizeof(NPIdentifier) * *count));
   for (unsigned int i = 0; i < *count; ++i)
     (*value)[i] = CreateNPIdentifier(value_param[i]);
 
   return true;
 }
 
 bool NPObjectProxy::NPNConstruct(NPObject *obj,
                                  const NPVariant *args,
                                  uint32_t arg_count,
@@ skipping 59 matching lines @@
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
     return false;
   }
 
   bool result = false;
   int render_view_id = proxy->render_view_id_;
   bool popups_allowed = false;
 
   if (npp) {
-    webkit::npapi::PluginInstance* plugin_instance =
-        reinterpret_cast<webkit::npapi::PluginInstance*>(npp->ndata);
+    PluginInstance* plugin_instance =
+        reinterpret_cast<PluginInstance*>(npp->ndata);
     if (plugin_instance)
       popups_allowed = plugin_instance->popups_allowed();
   }
 
   NPVariant_Param result_param;
   std::string script_str = std::string(
       script->UTF8Characters, script->UTF8Length);
 
   NPObjectMsg_Evaluate* msg = new NPObjectMsg_Evaluate(proxy->route_id(),
                                                        script_str,
@@ skipping 14 matching lines @@
   proxy = NULL;
   if (!result)
     return false;
 
   CreateNPVariant(
       result_param, channel.get(), result_var, render_view_id, page_url);
   return true;
 }
 
 }  // namespace content