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

content/child/plugin_param_traits.cc

Index: content/child/plugin_param_traits.cc
===================================================================
--- content/child/plugin_param_traits.cc	(revision 212369)
+++ content/child/plugin_param_traits.cc	(working copy)
@@ -5,10 +5,10 @@
 #include "content/child/plugin_param_traits.h"
 
 #include "base/strings/string_number_conversions.h"
+#include "content/child/npapi/plugin_host.h"
 #include "content/child/npruntime_util.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
-#include "webkit/plugins/npapi/plugin_host.h"
 
 namespace content {
 
@@ -128,7 +128,7 @@
   if (WebKit::WebBindings::identifierIsString(p.identifier)) {
     NPUTF8* str = WebKit::WebBindings::utf8FromIdentifier(p.identifier);
     l->append(str);
-    webkit::npapi::PluginHost::Singleton()->host_functions()->memfree(str);
+    content::PluginHost::Singleton()->host_functions()->memfree(str);
   } else {
     l->append(base::IntToString(
         WebKit::WebBindings::intFromIdentifier(p.identifier)));