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

webkit/plugins/ppapi/ppb_flash_net_connector_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_flash_net_connector_impl.h"
 
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
@@ skipping 30 matching lines @@
     return PP_ERROR_BADARGUMENT;
 
   if (!callback.func) {
     NOTIMPLEMENTED();
     return PP_ERROR_BADARGUMENT;
   }
 
   if (callback_.get() && !callback_->completed())
     return PP_ERROR_INPROGRESS;
 
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  if (!resource_id) {
-    NOTREACHED();
-    return PP_ERROR_FAILED;
-  }
-
   int32_t rv = instance()->delegate()->ConnectTcp(this, host, port);
   if (rv == PP_OK_COMPLETIONPENDING) {
     // Record callback and output buffers.
     callback_ = new TrackedCompletionCallback(
-        instance()->module()->GetCallbackTracker(), resource_id, callback);
+        instance()->module()->GetCallbackTracker(), pp_resource(), callback);
     socket_out_ = socket_out;
     local_addr_out_ = local_addr_out;
     remote_addr_out_ = remote_addr_out;
   } else {
     // This should never be completed synchronously successfully.
     DCHECK_NE(rv, PP_OK);
   }
   return rv;
 }
 
 int32_t PPB_Flash_NetConnector_Impl::ConnectTcpAddress(
     const PP_Flash_NetAddress* addr,
     PP_FileHandle* socket_out,
     PP_Flash_NetAddress* local_addr_out,
     PP_Flash_NetAddress* remote_addr_out,
     PP_CompletionCallback callback) {
   // |socket_out| is not optional.
   if (!socket_out)
     return PP_ERROR_BADARGUMENT;
 
   if (!callback.func) {
     NOTIMPLEMENTED();
     return PP_ERROR_BADARGUMENT;
   }
 
   if (callback_.get() && !callback_->completed())
     return PP_ERROR_INPROGRESS;
 
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  if (!resource_id) {
-    NOTREACHED();
-    return PP_ERROR_FAILED;
-  }
-
   int32_t rv = instance()->delegate()->ConnectTcpAddress(this, addr);
   if (rv == PP_OK_COMPLETIONPENDING) {
     // Record callback and output buffers.
     callback_ = new TrackedCompletionCallback(
-        instance()->module()->GetCallbackTracker(), resource_id, callback);
+        instance()->module()->GetCallbackTracker(), pp_resource(), callback);
     socket_out_ = socket_out;
     local_addr_out_ = local_addr_out;
     remote_addr_out_ = remote_addr_out;
   } else {
     // This should never be completed synchronously successfully.
     DCHECK_NE(rv, PP_OK);
   }
   return rv;
 }
 
@@ skipping 26 matching lines @@
   socket_out_ = NULL;
   local_addr_out_ = NULL;
   remote_addr_out_ = NULL;
 
   callback->Run(rv);  // Will complete abortively if necessary.
 }
 
 }  // namespace ppapi
 }  // namespace webkit