Remove PP_Module from parameters for PPB_Var.VarFromUtf8.

ppapi/shared_impl/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 "ppapi/shared_impl/var.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var_tracker.h"
 
 namespace ppapi {
 
 // Var -------------------------------------------------------------------------
 
-Var::Var(PP_Module module) : pp_module_(module), var_id_(0) {
+Var::Var() : var_id_(0) {
 }
 
 Var::~Var() {
 }
 
 // static
 std::string Var::PPVarToLogString(PP_Var var) {
   switch (var.type) {
     case PP_VARTYPE_UNDEFINED:
       return "[Undefined]";
@@ skipping 59 matching lines @@
   return var_id_;
 }
 
 void Var::AssignVarID(int32 id) {
   DCHECK(!var_id_);  // Must not have already been generated.
   var_id_ = id;
 }
 
 // StringVar -------------------------------------------------------------------
 
-StringVar::StringVar(PP_Module module, const std::string& str)
-    : Var(module),
-      value_(str) {
+StringVar::StringVar(const std::string& str)
+    : value_(str) {
 }
 
-StringVar::StringVar(PP_Module module, const char* str, uint32 len)
-    : Var(module),
-      value_(str, len) {
+StringVar::StringVar(const char* str, uint32 len)
+    : value_(str, len) {
 }
 
 StringVar::~StringVar() {
 }
 
 StringVar* StringVar::AsStringVar() {
   return this;
 }
 
 PP_Var StringVar::GetPPVar() {
   int32 id = GetOrCreateVarID();
   if (!id)
     return PP_MakeNull();
 
   PP_Var result;
   result.type = PP_VARTYPE_STRING;
   result.padding = 0;
   result.value.as_id = id;
   return result;
 }
 
 PP_VarType StringVar::GetType() const {
   return PP_VARTYPE_STRING;
 }
 
 // static
-PP_Var StringVar::StringToPPVar(PP_Module module, const std::string& var) {
-  return StringToPPVar(module, var.c_str(), var.size());
+PP_Var StringVar::StringToPPVar(const std::string& var) {
+  return StringToPPVar(var.c_str(), var.size());
 }
 
 // static
-PP_Var StringVar::StringToPPVar(PP_Module module,
-                                const char* data, uint32 len) {
-  scoped_refptr<StringVar> str(new StringVar(module, data, len));
+PP_Var StringVar::StringToPPVar(const char* data, uint32 len) {
+  scoped_refptr<StringVar> str(new StringVar(data, len));
   if (!str || !IsStringUTF8(str->value()))
     return PP_MakeNull();
   return str->GetPPVar();
 }
 
 // static
 StringVar* StringVar::FromPPVar(PP_Var var) {
   if (var.type != PP_VARTYPE_STRING)
     return NULL;
   scoped_refptr<Var> var_object(
       PpapiGlobals::Get()->GetVarTracker()->GetVar(var));
   if (!var_object)
     return NULL;
   return var_object->AsStringVar();
 }
 
 }  // namespace ppapi