Shim calls to NPN_MemAlloc/MemFree through PluginHost

content/public/common/webkit_param_traits.cc

 // Copyright (c) 2011 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.
 
 // NOTE: New trait definitions that will be used by Chrome Frame must be placed
 // in common_param_traits2.cc.
 
 #include "content/public/common/webkit_param_traits.h"
 
 #include "base/string_number_conversions.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/content_constants.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/plugins/npapi/plugin_host.h"
 
 NPIdentifier_Param::NPIdentifier_Param()
     : identifier() {
 }
 
 NPIdentifier_Param::~NPIdentifier_Param() {
 }
 
 NPVariant_Param::NPVariant_Param()
     : type(NPVARIANT_PARAM_VOID),
@@ skipping 201 matching lines @@
 bool ParamTraits<NPIdentifier_Param>::Read(const Message* m,
                                            void** iter,
                                            param_type* r) {
   return webkit_glue::DeserializeNPIdentifier(*m, 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);
-    NPN_MemFree(str);
+    webkit::npapi::PluginHost::Singleton()->host_functions()->memfree(str);
   } else {
     l->append(base::IntToString(
         WebKit::WebBindings::intFromIdentifier(p.identifier)));
   }
 }
 
 void ParamTraits<webkit::WebPluginMimeType>::Write(Message* m,
                                                    const param_type& p) {
   WriteParam(m, p.mime_type);
   WriteParam(m, p.file_extensions);
@@ skipping 90 matching lines @@
       ReadParam(m, iter, &p->ssl_valid) &&
       ReadParam(m, iter, &p->preferred) &&
       ReadParam(m, iter, &p->blacklisted_by_user);
 }
 void ParamTraits<webkit_glue::PasswordForm>::Log(const param_type& p,
                                                  std::string* l) {
   l->append("<PasswordForm>");
 }
 
 }  // namespace IPC