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

content/child/plugin_param_traits.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/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 {
 
 NPIdentifier_Param::NPIdentifier_Param()
     : identifier() {
 }
 
 NPIdentifier_Param::~NPIdentifier_Param() {
 }
 
@@ skipping 99 matching lines @@
 bool ParamTraits<NPIdentifier_Param>::Read(const Message* m,
                                            PickleIterator* iter,
                                            param_type* r) {
   return content::DeserializeNPIdentifier(iter, &r->identifier);
 }
 
 void ParamTraits<NPIdentifier_Param>::Log(const param_type& p, std::string* l) {
   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)));
   }
 }
 
 }  // namespace IPC