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

ppapi/proxy/websocket_resource.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 "ppapi/proxy/websocket_resource.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 353 matching lines @@
     const std::string& protocol) {
   if (!TrackedCallback::IsPending(connect_callback_))
     return;
 
   int32_t result = params.result();
   if (result == PP_OK) {
     state_ = PP_WEBSOCKETREADYSTATE_OPEN;
     protocol_ = new StringVar(protocol);
     url_ = new StringVar(url);
   }
-  TrackedCallback::ClearAndRun(&connect_callback_, params.result());
+  connect_callback_->Run(params.result());
 }
 
 void WebSocketResource::OnPluginMsgCloseReply(
     const ResourceMessageReplyParams& params,
     unsigned long buffered_amount,
     bool was_clean,
     unsigned short code,
     const std::string& reason) {
   // Set close related properties.
   state_ = PP_WEBSOCKETREADYSTATE_CLOSED;
@@ skipping 20 matching lines @@
   // Dispose packets after receiving an error or in invalid state.
   if (error_was_received_ || !InValidStateToReceive(state_))
     return;
 
   // Append received data to queue.
   received_messages_.push(scoped_refptr<Var>(new StringVar(message)));
 
   if (!TrackedCallback::IsPending(receive_callback_))
     return;
 
-  TrackedCallback::ClearAndRun(&receive_callback_, DoReceive());
+  receive_callback_->Run(DoReceive());
 }
 
 void WebSocketResource::OnPluginMsgReceiveBinaryReply(
     const ResourceMessageReplyParams& params,
     const std::vector<uint8_t>& message) {
   // Dispose packets after receiving an error or in invalid state.
   if (error_was_received_ || !InValidStateToReceive(state_))
     return;
 
   // Append received data to queue.
   scoped_refptr<Var> message_var(ArrayBufferVar::FromPPVar(
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           message.size(),
           &message.front())));
   received_messages_.push(message_var);
 
   if (!TrackedCallback::IsPending(receive_callback_))
     return;
 
-  TrackedCallback::ClearAndRun(&receive_callback_, DoReceive());
+  receive_callback_->Run(DoReceive());
 }
 
 void WebSocketResource::OnPluginMsgErrorReply(
     const ResourceMessageReplyParams& params) {
   error_was_received_ = true;
 
   if (!TrackedCallback::IsPending(receive_callback_))
     return;
 
   // No more text or binary messages will be received. If there is ongoing
   // ReceiveMessage(), we must invoke the callback with error code here.
   receive_callback_var_ = NULL;
-  TrackedCallback::ClearAndRun(&receive_callback_, PP_ERROR_FAILED);
+  receive_callback_->Run(PP_ERROR_FAILED);
 }
 
 void WebSocketResource::OnPluginMsgBufferedAmountReply(
     const ResourceMessageReplyParams& params,
     unsigned long buffered_amount) {
   buffered_amount_ = buffered_amount;
 }
 
 void WebSocketResource::OnPluginMsgStateReply(
     const ResourceMessageReplyParams& params,
@@ skipping 15 matching lines @@
     return PP_OK;
 
   *receive_callback_var_ = received_messages_.front()->GetPPVar();
   received_messages_.pop();
   receive_callback_var_ = NULL;
   return PP_OK;
 }
 
 }  // namespace proxy
 }  // namespace ppapi