Use the new callback tracker and delete the old one

webkit/plugins/ppapi/callbacks_unittest.cc

Index: webkit/plugins/ppapi/callbacks_unittest.cc
diff --git a/webkit/plugins/ppapi/callbacks_unittest.cc b/webkit/plugins/ppapi/callbacks_unittest.cc
deleted file mode 100644
index 8e90b315f1aeec7944a1121f0ac5de2d95cb7a26..0000000000000000000000000000000000000000
--- a/webkit/plugins/ppapi/callbacks_unittest.cc
+++ /dev/null
@@ -1,256 +0,0 @@
-// 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"
-#include "ppapi/shared_impl/resource_tracker.h"
-#include "webkit/plugins/ppapi/callbacks.h"
-#include "webkit/plugins/ppapi/host_globals.h"
-#include "webkit/plugins/ppapi/mock_resource.h"
-#include "webkit/plugins/ppapi/plugin_module.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
-#include "webkit/plugins/ppapi/resource_helper.h"
-
-namespace webkit {
-namespace ppapi {
-
-struct CallbackRunInfo {
-  // All valid results (PP_OK, PP_ERROR_...) are nonpositive.
-  CallbackRunInfo() : run_count(0), result(1) {}
-  unsigned run_count;
-  int32_t result;
-};
-
-namespace {
-
-void TestCallback(void* user_data, int32_t result) {
-  CallbackRunInfo* info = reinterpret_cast<CallbackRunInfo*>(user_data);
-  info->run_count++;
-  if (info->run_count == 1)
-    info->result = result;
-}
-
-}  // namespace
-
-// CallbackShutdownTest --------------------------------------------------------
-
-// Tests that callbacks are properly aborted on module shutdown.
-class CallbackShutdownTest : public PpapiUnittest {
- public:
-  CallbackShutdownTest() {}
-
-  // Cases:
-  // (1) A callback which is run (so shouldn't be aborted on shutdown).
-  // (2) A callback which is aborted (so shouldn't be aborted on shutdown).
-  // (3) A callback which isn't run (so should be aborted on shutdown).
-  CallbackRunInfo& info_did_run() { return info_did_run_; }  // (1)
-  CallbackRunInfo& info_did_abort() { return info_did_abort_; }  // (2)
-  CallbackRunInfo& info_didnt_run() { return info_didnt_run_; }  // (3)
-
- private:
-  CallbackRunInfo info_did_run_;
-  CallbackRunInfo info_did_abort_;
-  CallbackRunInfo info_didnt_run_;
-};
-
-TEST_F(CallbackShutdownTest, AbortOnShutdown) {
-  // Set up case (1) (see above).
-  EXPECT_EQ(0U, info_did_run().run_count);
-  scoped_refptr<TrackedCompletionCallback> callback_did_run =
-      new TrackedCompletionCallback(
-          instance()->module()->GetCallbackTracker(),
-          0,
-          PP_MakeCompletionCallback(&TestCallback, &info_did_run()));
-  EXPECT_EQ(0U, info_did_run().run_count);
-  callback_did_run->Run(PP_OK);
-  EXPECT_EQ(1U, info_did_run().run_count);
-  EXPECT_EQ(PP_OK, info_did_run().result);
-
-  // Set up case (2).
-  EXPECT_EQ(0U, info_did_abort().run_count);
-  scoped_refptr<TrackedCompletionCallback> callback_did_abort =
-      new TrackedCompletionCallback(
-          instance()->module()->GetCallbackTracker(),
-          0,
-          PP_MakeCompletionCallback(&TestCallback, &info_did_abort()));
-  EXPECT_EQ(0U, info_did_abort().run_count);
-  callback_did_abort->Abort();
-  EXPECT_EQ(1U, info_did_abort().run_count);
-  EXPECT_EQ(PP_ERROR_ABORTED, info_did_abort().result);
-
-
-  // Set up case (3).
-  EXPECT_EQ(0U, info_didnt_run().run_count);
-  scoped_refptr<TrackedCompletionCallback> callback_didnt_run =
-      new TrackedCompletionCallback(
-          instance()->module()->GetCallbackTracker(),
-          0,
-          PP_MakeCompletionCallback(&TestCallback, &info_didnt_run()));
-  EXPECT_EQ(0U, info_didnt_run().run_count);
-
-  ShutdownModule();
-
-  // Check case (1).
-  EXPECT_EQ(1U, info_did_run().run_count);
-
-  // Check case (2).
-  EXPECT_EQ(1U, info_did_abort().run_count);
-
-  // Check case (3).
-  EXPECT_EQ(1U, info_didnt_run().run_count);
-  EXPECT_EQ(PP_ERROR_ABORTED, info_didnt_run().result);
-}
-
-// -----------------------------------------------------------------------------
-
-namespace {
-
-class CallbackMockResource : public MockResource {
- public:
-  CallbackMockResource(PP_Instance instance) : MockResource(instance) {}
-  ~CallbackMockResource() {}
-
-  PP_Resource SetupForTest() {
-    PP_Resource resource_id = GetReference();
-    EXPECT_NE(0, resource_id);
-
-    PluginModule* module = ResourceHelper::GetPluginModule(this);
-
-    callback_did_run_ = new TrackedCompletionCallback(
-        module->GetCallbackTracker(),
-        resource_id,
-        PP_MakeCompletionCallback(&TestCallback, &info_did_run_));
-    EXPECT_EQ(0U, info_did_run_.run_count);
-
-    callback_did_abort_ = new TrackedCompletionCallback(
-        module->GetCallbackTracker(),
-        resource_id,
-        PP_MakeCompletionCallback(&TestCallback, &info_did_abort_));
-    EXPECT_EQ(0U, info_did_abort_.run_count);
-
-    callback_didnt_run_ = new TrackedCompletionCallback(
-        module->GetCallbackTracker(),
-        resource_id,
-        PP_MakeCompletionCallback(&TestCallback, &info_didnt_run_));
-    EXPECT_EQ(0U, info_didnt_run_.run_count);
-
-    callback_did_run_->Run(PP_OK);
-    callback_did_abort_->Abort();
-
-    CheckIntermediateState();
-
-    return resource_id;
-  }
-
-  void CheckIntermediateState() {
-    EXPECT_EQ(1U, info_did_run_.run_count);
-    EXPECT_EQ(PP_OK, info_did_run_.result);
-
-    EXPECT_EQ(1U, info_did_abort_.run_count);
-    EXPECT_EQ(PP_ERROR_ABORTED, info_did_abort_.result);
-
-    EXPECT_EQ(0U, info_didnt_run_.run_count);
-  }
-
-  void CheckFinalState() {
-    EXPECT_EQ(1U, info_did_run_.run_count);
-    EXPECT_EQ(PP_OK, info_did_run_.result);
-    EXPECT_EQ(1U, info_did_abort_.run_count);
-    EXPECT_EQ(PP_ERROR_ABORTED, info_did_abort_.result);
-    EXPECT_EQ(1U, info_didnt_run_.run_count);
-    EXPECT_EQ(PP_ERROR_ABORTED, info_didnt_run_.result);
-  }
-
-  scoped_refptr<TrackedCompletionCallback> callback_did_run_;
-  CallbackRunInfo info_did_run_;
-
-  scoped_refptr<TrackedCompletionCallback> callback_did_abort_;
-  CallbackRunInfo info_did_abort_;
-
-  scoped_refptr<TrackedCompletionCallback> callback_didnt_run_;
-  CallbackRunInfo info_didnt_run_;
-};
-
-}  // namespace
-
-class CallbackResourceTest : public PpapiUnittest {
- public:
-  CallbackResourceTest() {}
-};
-
-// Test that callbacks get aborted on the last resource unref.
-TEST_F(CallbackResourceTest, AbortOnNoRef) {
-  HostResourceTracker* resource_tracker =
-      HostGlobals::Get()->host_resource_tracker();
-
-  // Test several things: Unref-ing a resource (to zero refs) with callbacks
-  // which (1) have been run, (2) have been aborted, (3) haven't been completed.
-  // Check that the uncompleted one gets aborted, and that the others don't get
-  // called again.
-  scoped_refptr<CallbackMockResource> resource_1(
-      new CallbackMockResource(instance()->pp_instance()));
-  PP_Resource resource_1_id = resource_1->SetupForTest();
-
-  // Also do the same for a second resource, and make sure that unref-ing the
-  // first resource doesn't much up the second resource.
-  scoped_refptr<CallbackMockResource> resource_2(
-      new CallbackMockResource(instance()->pp_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->ReleaseResource(resource_1_id);
-  MessageLoop::current()->RunAllPending();
-  resource_1->CheckFinalState();
-  resource_2->CheckIntermediateState();
-
-  // Kill resource #2.
-  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) {
-  HostResourceTracker* resource_tracker =
-      HostGlobals::Get()->host_resource_tracker();
-
-  scoped_refptr<CallbackMockResource> resource(
-      new CallbackMockResource(instance()->pp_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->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->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