Unify var tracking between webkit and the proxy.

ppapi/proxy/serialized_var_unittest.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/proxy/ppapi_proxy_test.h"
 
 #include "ppapi/proxy/serialized_var.h"
 
 namespace pp {
 namespace proxy {
@@ skipping 81 matching lines @@
     SerializedVarReceiveInput receive_input2(input2);
     PP_Var plugin_object2 = receive_input2.Get(plugin_dispatcher());
     EXPECT_EQ(plugin_object.value.as_id, plugin_object2.value.as_id);
     EXPECT_EQ(0, var_tracker().GetRefCountForObject(plugin_object));
     EXPECT_EQ(0u, sink().message_count());
 
     // Take a reference to the object, as if the plugin was using it, and then
     // release it, we should still be tracking the object since the
     // ReceiveInputs keep the "track_with_no_reference_count" alive until
     // they're destroyed.
-    var_tracker().AddRef(plugin_object);
+    var_tracker().AddRefVar(plugin_object);
     EXPECT_EQ(1, var_tracker().GetRefCountForObject(plugin_object));
-    var_tracker().Release(plugin_object);
+    var_tracker().ReleaseVar(plugin_object);
     EXPECT_EQ(0, var_tracker().GetRefCountForObject(plugin_object));
     EXPECT_EQ(2u, sink().message_count());
   }
 
   // Since we didn't keep any refs to the objects, it should have freed the
   // object.
   EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object));
 }
 
 // Tests the plugin receiving a var as a return value from the browser
@@ skipping 21 matching lines @@
     EXPECT_EQ(2, var_tracker().GetRefCountForObject(plugin_object));
     EXPECT_EQ(1u, sink().message_count());
   }
 
   // The ReceiveSerializedVarReturnValue destructor shouldn't have affected
   // the refcount or sent any messages.
   EXPECT_EQ(2, var_tracker().GetRefCountForObject(plugin_object));
   EXPECT_EQ(1u, sink().message_count());
 
   // Manually release one refcount, it shouldn't have sent any more messages.
-  var_tracker().Release(plugin_object);
+  var_tracker().ReleaseVar(plugin_object);
   EXPECT_EQ(1, var_tracker().GetRefCountForObject(plugin_object));
   EXPECT_EQ(1u, sink().message_count());
 
   // Manually release the last refcount, it should have freed it and sent a
   // release message to the browser.
-  var_tracker().Release(plugin_object);
+  var_tracker().ReleaseVar(plugin_object);
   EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object));
   EXPECT_EQ(2u, sink().message_count());
 }
 
 // Returns a value from the browser to the plugin, then return that one ref
 // back to the browser.
 TEST_F(SerializedVarTest, PluginReturnValue) {
   PP_Var host_object = MakeObjectVar(0x31337);
 
   PP_Var plugin_object;
@@ skipping 19 matching lines @@
   }
 
   // When the ReturnValue object goes out of scope, it should have sent a
   // release message to the browser.
   EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object));
   EXPECT_EQ(1u, sink().message_count());
 }
 
 }  // namespace proxy
 }  // namespace pp