Use the new callback tracker and delete the old one

webkit/plugins/ppapi/ppb_broker_impl.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/ppb_broker_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/shared_impl/platform_file.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
-using ::ppapi::PlatformFileToInt;
-using ::ppapi::thunk::PPB_Broker_API;
+using ppapi::PlatformFileToInt;
+using ppapi::thunk::PPB_Broker_API;
+using ppapi::TrackedCallback;
 
 namespace webkit {
 namespace ppapi {
 
 // PPB_Broker_Impl ------------------------------------------------------
 
 PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance)
     : Resource(instance),
       broker_(NULL),
       connect_callback_(),
@@ skipping 28 matching lines @@
   }
 
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return PP_ERROR_FAILED;
 
   // The callback must be populated now in case we are connected to the broker
   // and BrokerConnected is called before ConnectToPpapiBroker returns.
   // Because it must be created now, it must be aborted and cleared if
   // ConnectToPpapiBroker fails.
-  connect_callback_ = new TrackedCompletionCallback(
-      plugin_instance->module()->GetCallbackTracker(), pp_resource(),
-      connect_callback);
+  connect_callback_ = new TrackedCallback(this, connect_callback);
 
   broker_ = plugin_instance->delegate()->ConnectToPpapiBroker(this);
   if (!broker_) {
-    scoped_refptr<TrackedCompletionCallback> callback;
-    callback.swap(connect_callback_);
-    callback->Abort();
+    TrackedCallback::ClearAndAbort(&connect_callback_);
     return PP_ERROR_FAILED;
   }
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_Broker_Impl::GetHandle(int32_t* handle) {
   if (pipe_handle_ == PlatformFileToInt(base::kInvalidPlatformFileValue))
     return PP_ERROR_FAILED;  // Handle not set yet.
   *handle = pipe_handle_;
   return PP_OK;
 }
 
 // Transfers ownership of the handle to the plugin.
 void PPB_Broker_Impl::BrokerConnected(int32_t handle, int32_t result) {
   DCHECK(pipe_handle_ ==
          PlatformFileToInt(base::kInvalidPlatformFileValue));
   DCHECK(result == PP_OK ||
          handle == PlatformFileToInt(base::kInvalidPlatformFileValue));
 
   pipe_handle_ = handle;
 
   // Synchronous calls are not supported.
-  DCHECK(connect_callback_.get() && !connect_callback_->completed());
+  DCHECK(TrackedCallback::IsPending(connect_callback_));
 
-  scoped_refptr<TrackedCompletionCallback> callback;
-  callback.swap(connect_callback_);
-  callback->Run(result);  // Will complete abortively if necessary.
+  TrackedCallback::ClearAndRun(&connect_callback_, result);
 }
 
 }  // namespace ppapi
 }  // namespace webkit