Remove PP_Module from parameters for PPB_Var.VarFromUtf8.

ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_var.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.
 
 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_var.h"
 
 #include <stdio.h>
 
 #include <string>
 #include <utility>
@@ skipping 17 matching lines @@
               PluginVar::DebugString(var).c_str());
   ProxyVarCache::GetInstance().RetainProxyVar(var);
 }
 
 void Release(PP_Var var) {
   DebugPrintf("PPB_Var::Release: var=PPB_Var(%s)\n",
               PluginVar::DebugString(var).c_str());
   ProxyVarCache::GetInstance().ReleaseProxyVar(var);
 }
 
-PP_Var VarFromUtf8(PP_Module module_id, const char* data, uint32_t len) {
+PP_Var VarFromUtf8(const char* data, uint32_t len) {
   DebugPrintf("PPB_Var::VarFromUtf8: data='%.*s'\n", len, data);
-  UNREFERENCED_PARAMETER(module_id);
   if (!StringIsUtf8(data, len)) {
     DebugPrintf("PPB_Var::VarFromUtf8: not UTF8\n");
     return PP_MakeNull();
   }
   SharedProxyVar proxy_var(new StringProxyVar(data, len));
   ProxyVarCache::GetInstance().RetainSharedProxyVar(proxy_var);
   PP_Var var;
   var.type = PP_VARTYPE_STRING;
   var.value.as_id = proxy_var->id();
   // Increment the reference count for the return to the caller.
   AddRef(var);
   DebugPrintf("PPB_Var::VarFromUtf8: as_id=%"NACL_PRId64"\n", var.value.as_id);
   return var;
 }
 
+PP_Var VarFromUtf8_1_0(PP_Module /*module*/, const char* data, uint32_t len) {
+  return VarFromUtf8(data, len);
+}
+
 const char* VarToUtf8(PP_Var var, uint32_t* len) {
   DebugPrintf("PPB_Var::VarToUtf8: as_id=%"NACL_PRId64"\n", var.value.as_id);
   SharedStringProxyVar string_var = StringProxyVar::CastFromProxyVar(
       ProxyVarCache::GetInstance().SharedProxyVarForVar(var));
   const char* data = NULL;
   if (string_var == NULL) {
     *len = 0;
   } else {
     *len = static_cast<uint32_t>(string_var->contents().size());
     // Mimics PPAPI implementation: as long as SharedStringProxyVar is alive,
@@ skipping 19 matching lines @@
 const PPB_Var* PluginVar::GetInterface() {
   static const PPB_Var var_interface = {
     AddRef,
     Release,
     VarFromUtf8,
     VarToUtf8
   };
   return &var_interface;
 }
 
+const PPB_Var_1_0* PluginVar::GetInterface1_0() {
+  static const PPB_Var_1_0 var_interface = {
+    AddRef,
+    Release,
+    VarFromUtf8_1_0,
+    VarToUtf8
+  };
+  return &var_interface;
+}
+
 std::string PluginVar::DebugString(const PP_Var& var) {
   switch (var.type) {
     case PP_VARTYPE_UNDEFINED:
       return "##UNDEFINED##";
     case PP_VARTYPE_NULL:
       return "##NULL##";
     case PP_VARTYPE_BOOL:
       return (var.value.as_bool ? "true" : "false");
     case PP_VARTYPE_INT32:
       {
@@ skipping 24 matching lines @@
       }
     case PP_VARTYPE_ARRAY:
     case PP_VARTYPE_DICTIONARY:
       NACL_NOTREACHED();
       break;
   }
   ASSERT_MSG(0, "Unexpected type seen");
   return "##ERROR##";
 }
 
-PP_Var PluginVar::StringToPPVar(PP_Module module_id, const std::string& str) {
+PP_Var PluginVar::StringToPPVar(const std::string& str) {
   static const PPB_Var* ppb_var = NULL;
   if (ppb_var == NULL) {
     ppb_var = static_cast<const PPB_Var*>(
         ppapi_proxy::PluginVar::GetInterface());
   }
   if (ppb_var == NULL) {
     return PP_MakeUndefined();
   }
-  return ppb_var->VarFromUtf8(
-      module_id, str.c_str(), nacl::assert_cast<uint32_t>(str.size()));
+  return ppb_var->VarFromUtf8(str.c_str(),
+                              nacl::assert_cast<uint32_t>(str.size()));
 }
 
 std::string PluginVar::PPVarToString(const PP_Var& var) {
   static const PPB_Var* ppb_var = NULL;
   if (ppb_var == NULL) {
     ppb_var = static_cast<const PPB_Var*>(
         ppapi_proxy::PluginVar::GetInterface());
   }
   if (ppb_var == NULL || var.type != PP_VARTYPE_STRING) {
     return "";
@@ skipping 30 matching lines @@
       DebugPrintf("PP_Var(object: %"NACL_PRIu64")", GetVarId(var));
       break;
     case PP_VARTYPE_ARRAY:
     case PP_VARTYPE_DICTIONARY:
       NACL_NOTREACHED();
       break;
   }
 }
 
 }  // namespace ppapi_proxy