Add a unified resource tracker shared between the proxy and the impl.

webkit/plugins/ppapi/callbacks_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 "webkit/plugins/ppapi/ppapi_unittest.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 184 matching lines @@
   // first resource doesn't much up the second resource.
   scoped_refptr<CallbackMockResource> resource_2(
       new CallbackMockResource(instance()));
   PP_Resource resource_2_id = resource_2->SetupForTest();
 
   // Double-check that resource #1 is still okay.
   resource_1->CheckIntermediateState();
 
   // Kill resource #1, spin the message loop to run posted calls, and check that
   // things are in the expected states.
-  resource_tracker->UnrefResource(resource_1_id);
+  resource_tracker->ReleaseResource(resource_1_id);
   MessageLoop::current()->RunAllPending();
   resource_1->CheckFinalState();
   resource_2->CheckIntermediateState();
 
   // Kill resource #2.
-  resource_tracker->UnrefResource(resource_2_id);
+  resource_tracker->ReleaseResource(resource_2_id);
   MessageLoop::current()->RunAllPending();
   resource_1->CheckFinalState();
   resource_2->CheckFinalState();
 
   // This shouldn't be needed, but make sure there are no stranded tasks.
   MessageLoop::current()->RunAllPending();
 }
 
 // Test that "resurrecting" a resource (getting a new ID for a |Resource|)
 // doesn't resurrect callbacks.
 TEST_F(CallbackResourceTest, Resurrection) {
   ResourceTracker* resource_tracker = ResourceTracker::Get();
 
   scoped_refptr<CallbackMockResource> resource(
       new CallbackMockResource(instance()));
   PP_Resource resource_id = resource->SetupForTest();
 
   // Unref it, spin the message loop to run posted calls, and check that things
   // are in the expected states.
-  resource_tracker->UnrefResource(resource_id);
+  resource_tracker->ReleaseResource(resource_id);
   MessageLoop::current()->RunAllPending();
   resource->CheckFinalState();
 
   // "Resurrect" it and check that the callbacks are still dead.
   PP_Resource new_resource_id = resource->GetReference();
   MessageLoop::current()->RunAllPending();
   resource->CheckFinalState();
 
   // Unref it again and do the same.
-  resource_tracker->UnrefResource(new_resource_id);
+  resource_tracker->ReleaseResource(new_resource_id);
   MessageLoop::current()->RunAllPending();
   resource->CheckFinalState();
 
   // This shouldn't be needed, but make sure there are no stranded tasks.
   MessageLoop::current()->RunAllPending();
 }
 
 }  // namespace ppapi
 }  // namespace webkit