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

ppapi/proxy/ppb_flash_net_connector_proxy.cc

Index: ppapi/proxy/ppb_flash_net_connector_proxy.cc
diff --git a/ppapi/proxy/ppb_flash_net_connector_proxy.cc b/ppapi/proxy/ppb_flash_net_connector_proxy.cc
index 0d9342801affe44cb4866a971a7495c68a52a346..c2227204b2ad8c710eb380d59598f2c33f0ab61e 100644
--- a/ppapi/proxy/ppb_flash_net_connector_proxy.cc
+++ b/ppapi/proxy/ppb_flash_net_connector_proxy.cc
@@ -10,7 +10,6 @@
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/thunk/enter.h"
@@ -19,6 +18,7 @@
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::EnterFunctionNoLock;
 using ppapi::thunk::PPB_Flash_NetConnector_API;
 using ppapi::thunk::ResourceCreationAPI;
@@ -50,12 +50,12 @@ class AbortCallbackTask : public Task {
 };
 
 class FlashNetConnector : public PPB_Flash_NetConnector_API,
-                          public PluginResource {
+                          public Resource {
  public:
   explicit FlashNetConnector(const HostResource& resource);
   virtual ~FlashNetConnector();
 
-  // ResourceObjectBase overrides.
+  // Resource overrides.
   virtual PPB_Flash_NetConnector_API* AsPPB_Flash_NetConnector_API() OVERRIDE;
 
   // PPB_Flash_NetConnector_API implementation.
@@ -92,7 +92,7 @@ class FlashNetConnector : public PPB_Flash_NetConnector_API,
 };
 
 FlashNetConnector::FlashNetConnector(const HostResource& resource)
-    : PluginResource(resource),
+    : Resource(resource),
       callback_(PP_BlockUntilComplete()),
       local_addr_out_(NULL),
       remote_addr_out_(NULL) {
@@ -163,7 +163,7 @@ int32_t FlashNetConnector::ConnectWithMessage(
     return PP_ERROR_INPROGRESS;  // Can only have one pending request.
 
   // Send the request, it will call us back via ConnectACK.
-  GetDispatcher()->Send(msg_deletor.release());
+  PluginDispatcher::GetForResource(this)->Send(msg_deletor.release());
 
   callback_ = callback;
   socket_out_ = socket_out;
@@ -230,9 +230,7 @@ PP_Resource PPB_Flash_NetConnector_Proxy::CreateProxyResource(
       INTERFACE_ID_PPB_FLASH_NETCONNECTOR, instance, &result));
   if (result.is_null())
     return 0;
-
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new FlashNetConnector(result));
+  return (new FlashNetConnector(result))->GetReference();
 }
 
 bool PPB_Flash_NetConnector_Proxy::OnMessageReceived(const IPC::Message& msg) {