Add a unified resource tracker shared between the proxy and the impl.

webkit/plugins/ppapi/ppb_transport_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_transport_impl.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 95 matching lines @@
     return PP_ERROR_INPROGRESS;
 
   P2PTransport::Protocol protocol = use_tcp_ ?
       P2PTransport::PROTOCOL_TCP : P2PTransport::PROTOCOL_UDP;
 
   if (!p2p_transport_->Init(name_, protocol, "", this))
     return PP_ERROR_FAILED;
 
   started_ = true;
 
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  CHECK(resource_id);
   connect_callback_ = new TrackedCompletionCallback(
-      instance()->module()->GetCallbackTracker(), resource_id, callback);
+      instance()->module()->GetCallbackTracker(), pp_resource(), callback);
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_Transport_Impl::GetNextAddress(PP_Var* address,
                                            PP_CompletionCallback callback) {
   if (!p2p_transport_.get())
     return PP_ERROR_FAILED;
 
   if (next_address_callback_.get() && !next_address_callback_->completed())
     return PP_ERROR_INPROGRESS;
 
   if (!local_candidates_.empty()) {
     *address = StringVar::StringToPPVar(instance()->module()->pp_module(),
                                         local_candidates_.front());
     local_candidates_.pop_front();
     return PP_OK;
   }
 
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  CHECK(resource_id);
   next_address_callback_ = new TrackedCompletionCallback(
-      instance()->module()->GetCallbackTracker(), resource_id, callback);
+      instance()->module()->GetCallbackTracker(), pp_resource(), callback);
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_Transport_Impl::ReceiveRemoteAddress(PP_Var address) {
   if (!p2p_transport_.get())
     return PP_ERROR_FAILED;
 
   scoped_refptr<StringVar> address_str = StringVar::FromPPVar(address);
   if (!address_str)
     return PP_ERROR_BADARGUMENT;
@@ skipping 11 matching lines @@
     return PP_ERROR_INPROGRESS;
 
   net::Socket* channel = p2p_transport_->GetChannel();
   if (!channel)
     return PP_ERROR_FAILED;
 
   scoped_refptr<net::IOBuffer> buffer =
       new net::WrappedIOBuffer(static_cast<const char*>(data));
   int result = MapNetError(channel->Read(buffer, len, &channel_read_callback_));
   if (result == PP_OK_COMPLETIONPENDING) {
-    PP_Resource resource_id = GetReferenceNoAddRef();
-    CHECK(resource_id);
     recv_callback_ = new TrackedCompletionCallback(
-        instance()->module()->GetCallbackTracker(), resource_id, callback);
+        instance()->module()->GetCallbackTracker(), pp_resource(), callback);
   }
 
   return result;
 }
 
 int32_t PPB_Transport_Impl::Send(const void* data, uint32_t len,
                                  PP_CompletionCallback callback) {
   if (!p2p_transport_.get())
     return PP_ERROR_FAILED;
 
   if (send_callback_.get() && !send_callback_->completed())
     return PP_ERROR_INPROGRESS;
 
   net::Socket* channel = p2p_transport_->GetChannel();
   if (!channel)
     return PP_ERROR_FAILED;
 
   scoped_refptr<net::IOBuffer> buffer =
       new net::WrappedIOBuffer(static_cast<const char*>(data));
   int result = MapNetError(channel->Write(buffer, len,
                                           &channel_write_callback_));
   if (result == PP_OK_COMPLETIONPENDING) {
-    PP_Resource resource_id = GetReferenceNoAddRef();
-    CHECK(resource_id);
     send_callback_ = new TrackedCompletionCallback(
-        instance()->module()->GetCallbackTracker(), resource_id, callback);
+        instance()->module()->GetCallbackTracker(), pp_resource(), callback);
   }
 
   return result;
 }
 
 int32_t PPB_Transport_Impl::Close() {
   if (!p2p_transport_.get())
     return PP_ERROR_FAILED;
 
   p2p_transport_.reset();
@@ skipping 41 matching lines @@
 void PPB_Transport_Impl::OnWritten(int result) {
   DCHECK(send_callback_.get() && !send_callback_->completed());
 
   scoped_refptr<TrackedCompletionCallback> callback;
   callback.swap(send_callback_);
   callback->Run(MapNetError(result));
 }
 
 }  // namespace ppapi
 }  // namespace webkit