PPAPI: Get TrackedCallback ready for running on non-main threads.

webkit/plugins/ppapi/ppb_broker_impl.cc

 // Copyright (c) 2012 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 "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
@@ skipping 46 matching lines @@
     return PP_ERROR_FAILED;
 
   // The callback must be populated now in case we are connected to the broker
   // and BrokerConnected is called before ConnectToBroker returns.
   // Because it must be created now, it must be aborted and cleared if
   // ConnectToBroker fails.
   connect_callback_ = connect_callback;
 
   broker_ = plugin_instance->delegate()->ConnectToBroker(this);
   if (!broker_) {
-    TrackedCallback::ClearAndAbort(&connect_callback_);
+    connect_callback_->Abort();
     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_;
@@ skipping 10 matching lines @@
   DCHECK(pipe_handle_ ==
          PlatformFileToInt(base::kInvalidPlatformFileValue));
   DCHECK(result == PP_OK ||
          handle == PlatformFileToInt(base::kInvalidPlatformFileValue));
 
   pipe_handle_ = handle;
 
   // Synchronous calls are not supported.
   DCHECK(TrackedCallback::IsPending(connect_callback_));
 
-  TrackedCallback::ClearAndRun(&connect_callback_, result);
+  connect_callback_->Run(result);
 }
 
 }  // namespace ppapi
 }  // namespace webkit