Unify var tracking between webkit and the proxy.

webkit/plugins/ppapi/ppapi_plugin_instance.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/ppapi_plugin_instance.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 591 matching lines @@
 
 string16 PluginInstance::GetSelectedText(bool html) {
   // Keep a reference on the stack. See NOTE above.
   scoped_refptr<PluginInstance> ref(this);
   if (!LoadSelectionInterface())
     return string16();
 
   PP_Var rv = plugin_selection_interface_->GetSelectedText(pp_instance(),
                                                            PP_FromBool(html));
   scoped_refptr<StringVar> string(StringVar::FromPPVar(rv));
-  Var::PluginReleasePPVar(rv);  // Release the ref the plugin transfered to us.
+  // Release the ref the plugin transfered to us.
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(rv);
   if (!string)
     return string16();
   return UTF8ToUTF16(string->value());
 }
 
 string16 PluginInstance::GetLinkAtPosition(const gfx::Point& point) {
   // Keep a reference on the stack. See NOTE above.
   scoped_refptr<PluginInstance> ref(this);
   if (!LoadPdfInterface())
     return string16();
 
   PP_Point p;
   p.x = point.x();
   p.y = point.y();
   PP_Var rv = plugin_pdf_interface_->GetLinkAtPosition(pp_instance(), p);
   scoped_refptr<StringVar> string(StringVar::FromPPVar(rv));
-  Var::PluginReleasePPVar(rv);  // Release the ref the plugin transfered to us.
+  // Release the ref the plugin transfered to us.
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(rv);
   if (!string)
     return string16();
   return UTF8ToUTF16(string->value());
 }
 
 void PluginInstance::Zoom(double factor, bool text_only) {
   // Keep a reference on the stack. See NOTE above.
   scoped_refptr<PluginInstance> ref(this);
   if (!LoadZoomInterface())
     return;
@@ skipping 898 matching lines @@
 void PluginInstance::PostMessage(PP_Instance instance, PP_Var message) {
   message_channel_->PostMessageToJavaScript(message);
 }
 
 void PluginInstance::SubscribeToPolicyUpdates(PP_Instance instance) {
   delegate()->SubscribeToPolicyUpdates(this);
 }
 
 }  // namespace ppapi
 }  // namespace webkit