| Index: ppapi/shared_impl/private/udp_socket_private_impl.cc
|
| diff --git a/ppapi/shared_impl/private/udp_socket_private_impl.cc b/ppapi/shared_impl/private/udp_socket_private_impl.cc
|
| index d3e94c1a48391352a3c5696ba18e3e9b953fbd08..288c38f908e3a752def689670cfee5c6c0e24dac 100644
|
| --- a/ppapi/shared_impl/private/udp_socket_private_impl.cc
|
| +++ b/ppapi/shared_impl/private/udp_socket_private_impl.cc
|
| @@ -162,8 +162,7 @@ void UDPSocketPrivateImpl::OnBindCompleted(
|
|
|
| bound_addr_ = addr;
|
|
|
| - TrackedCallback::ClearAndRun(&bind_callback_,
|
| - succeeded ? PP_OK : PP_ERROR_FAILED);
|
| + bind_callback_->Run(succeeded ? PP_OK : PP_ERROR_FAILED);
|
| }
|
|
|
| void UDPSocketPrivateImpl::OnRecvFromCompleted(
|
| @@ -184,8 +183,7 @@ void UDPSocketPrivateImpl::OnRecvFromCompleted(
|
| bytes_to_read_ = -1;
|
| recvfrom_addr_ = addr;
|
|
|
| - TrackedCallback::ClearAndRun(&recvfrom_callback_,
|
| - succeeded ? static_cast<int32_t>(data.size()) :
|
| + recvfrom_callback_->Run(succeeded ? static_cast<int32_t>(data.size()) :
|
| static_cast<int32_t>(PP_ERROR_FAILED));
|
| }
|
|
|
| @@ -196,7 +194,7 @@ void UDPSocketPrivateImpl::OnSendToCompleted(bool succeeded,
|
| return;
|
| }
|
|
|
| - TrackedCallback::ClearAndRun(&sendto_callback_,
|
| + sendto_callback_->Run(
|
| succeeded ? bytes_written : static_cast<int32_t>(PP_ERROR_FAILED));
|
| }
|
|
|
| @@ -218,7 +216,7 @@ void UDPSocketPrivateImpl::Init(uint32 socket_id) {
|
|
|
| void UDPSocketPrivateImpl::PostAbortIfNecessary(
|
| scoped_refptr<TrackedCallback>* callback) {
|
| - if (callback->get())
|
| + if (TrackedCallback::IsPending(*callback))
|
| (*callback)->PostAbort();
|
| }
|
|
|
|
|