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

ppapi/shared_impl/private/tcp_socket_private_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 "ppapi/shared_impl/private/tcp_socket_private_impl.h"
 
 #include <string.h>
 
 #include <algorithm>
 
@@ skipping 214 matching lines @@
       !TrackedCallback::IsPending(connect_callback_)) {
     NOTREACHED();
     return;
   }
 
   if (succeeded) {
     local_addr_ = local_addr;
     remote_addr_ = remote_addr;
     connection_state_ = CONNECTED;
   }
-  TrackedCallback::ClearAndRun(&connect_callback_,
-                               succeeded ? PP_OK : PP_ERROR_FAILED);
+  connect_callback_->Run(succeeded ? PP_OK : PP_ERROR_FAILED);
 }
 
 void TCPSocketPrivateImpl::OnSSLHandshakeCompleted(
     bool succeeded,
     const PPB_X509Certificate_Fields& certificate_fields) {
   if (connection_state_ != CONNECTED ||
       !TrackedCallback::IsPending(ssl_handshake_callback_)) {
     NOTREACHED();
     return;
   }
 
   if (succeeded) {
     connection_state_ = SSL_CONNECTED;
     server_certificate_ = new PPB_X509Certificate_Private_Shared(
         resource_type_,
         pp_instance(),
         certificate_fields);
-    TrackedCallback::ClearAndRun(&ssl_handshake_callback_, PP_OK);
+    ssl_handshake_callback_->Run(PP_OK);
   } else {
     // The resource might be released in the callback so we need to hold
     // a reference so we can Disconnect() first.
     AddRef();
-    TrackedCallback::ClearAndRun(&ssl_handshake_callback_, PP_ERROR_FAILED);
+    ssl_handshake_callback_->Run(PP_ERROR_FAILED);
     Disconnect();
     Release();
   }
 }
 
 void TCPSocketPrivateImpl::OnReadCompleted(bool succeeded,
                                            const std::string& data) {
   if (!TrackedCallback::IsPending(read_callback_) || !read_buffer_) {
     NOTREACHED();
     return;
   }
 
   if (succeeded) {
     CHECK_LE(static_cast<int32_t>(data.size()), bytes_to_read_);
     if (!data.empty())
       memcpy(read_buffer_, data.c_str(), data.size());
   }
   read_buffer_ = NULL;
   bytes_to_read_ = -1;
 
-  TrackedCallback::ClearAndRun(
-      &read_callback_,
+  read_callback_->Run(
       succeeded ? static_cast<int32_t>(data.size()) :
                   static_cast<int32_t>(PP_ERROR_FAILED));
 }
 
 void TCPSocketPrivateImpl::OnWriteCompleted(bool succeeded,
                                             int32_t bytes_written) {
   if (!TrackedCallback::IsPending(write_callback_) ||
       (succeeded && bytes_written < 0)) {
     NOTREACHED();
     return;
   }
 
-  TrackedCallback::ClearAndRun(
-      &write_callback_,
+  write_callback_->Run(
       succeeded ? bytes_written : static_cast<int32_t>(PP_ERROR_FAILED));
 }
 
 void TCPSocketPrivateImpl::Init(uint32 socket_id) {
   DCHECK(socket_id != 0);
   socket_id_ = socket_id;
   connection_state_ = BEFORE_CONNECT;
   read_buffer_ = NULL;
   bytes_to_read_ = -1;
 
   local_addr_.size = 0;
   memset(local_addr_.data, 0,
          arraysize(local_addr_.data) * sizeof(*local_addr_.data));
   remote_addr_.size = 0;
   memset(remote_addr_.data, 0,
          arraysize(remote_addr_.data) * sizeof(*remote_addr_.data));
 }
 
 bool TCPSocketPrivateImpl::IsConnected() const {
   return connection_state_ == CONNECTED || connection_state_ == SSL_CONNECTED;
 }
 
 void TCPSocketPrivateImpl::PostAbortIfNecessary(
     scoped_refptr<TrackedCallback>* callback) {
-  if (callback->get())
+  if (TrackedCallback::IsPending(*callback))
     (*callback)->PostAbort();
 }
 
 }  // namespace ppapi