Unify var tracking between webkit and the proxy.

webkit/plugins/ppapi/npobject_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 "webkit/plugins/ppapi/npobject_var.h"
 
 #include "base/logging.h"
 #include "ppapi/c/pp_var.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
@@ skipping 28 matching lines @@
   int32 id = GetOrCreateVarID();
   if (!id)
     return PP_MakeNull();
 
   PP_Var result;
   result.type = PP_VARTYPE_OBJECT;
   result.value.as_id = id;
   return result;
 }
 
+PP_VarType NPObjectVar::GetType() const {
+  return PP_VARTYPE_OBJECT;
+}
+
 void NPObjectVar::InstanceDeleted() {
   DCHECK(pp_instance_);
   pp_instance_ = 0;
 }
 
 // static
 scoped_refptr<NPObjectVar> NPObjectVar::FromPPVar(PP_Var var) {
   if (var.type != PP_VARTYPE_OBJECT)
     return scoped_refptr<NPObjectVar>(NULL);
-  scoped_refptr<Var> var_object(webkit::ppapi::ResourceTracker::Get()->GetVar(
-      static_cast<int32>(var.value.as_id)));
+  scoped_refptr<Var> var_object(
+      webkit::ppapi::ResourceTracker::Get()->GetVarTracker()->GetVar(var));
   if (!var_object)
     return scoped_refptr<NPObjectVar>();
   return scoped_refptr<NPObjectVar>(var_object->AsNPObjectVar());
 }
 
 }  // namespace ppapi