Unify var tracking between webkit and the proxy.

webkit/plugins/ppapi/npapi_glue.cc

Index: webkit/plugins/ppapi/npapi_glue.cc
===================================================================
--- webkit/plugins/ppapi/npapi_glue.cc	(revision 96002)
+++ webkit/plugins/ppapi/npapi_glue.cc	(working copy)
@@ -159,7 +159,7 @@
   // been lost.
   DCHECK(checked_exception_);
 
-  NPObjectVar::PluginReleasePPVar(exception_);
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(exception_);
 }
 
 // Call this with the return value of the PPAPI function. It will convert
@@ -184,7 +184,7 @@
   // No matter what happened, we need to release the reference to the
   // value passed in. On success, a reference to this value will be in
   // the np_result_.
-  ::ppapi::Var::PluginReleasePPVar(result);
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(result);
   return success_;
 }
 
@@ -237,8 +237,9 @@
 }
 
 PPVarArrayFromNPVariantArray::~PPVarArrayFromNPVariantArray() {
+  ::ppapi::VarTracker* var_tracker = ResourceTracker::Get()->GetVarTracker();
   for (size_t i = 0; i < size_; i++)
-    ::ppapi::Var::PluginReleasePPVar(array_[i]);
+    var_tracker->ReleaseVar(array_[i]);
 }
 
 // PPVarFromNPObject -----------------------------------------------------------
@@ -248,7 +249,7 @@
 }
 
 PPVarFromNPObject::~PPVarFromNPObject() {
-  ::ppapi::Var::PluginReleasePPVar(var_);
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(var_);
 }
 
 // NPObjectAccessorWithIdentifier ----------------------------------------------
@@ -268,7 +269,7 @@
 }
 
 NPObjectAccessorWithIdentifier::~NPObjectAccessorWithIdentifier() {
-  ::ppapi::Var::PluginReleasePPVar(identifier_);
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(identifier_);
 }
 
 // TryCatch --------------------------------------------------------------------