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

ppapi/proxy/ppb_flash_file_proxy.cc

Index: ppapi/proxy/ppb_flash_file_proxy.cc
diff --git a/ppapi/proxy/ppb_flash_file_proxy.cc b/ppapi/proxy/ppb_flash_file_proxy.cc
index 825f02e358387fe41673c174d26bd86f97cf7442..b3b2aa28ae6b1b69a2fc61738f4c2e74150a0c8f 100644
--- a/ppapi/proxy/ppb_flash_file_proxy.cc
+++ b/ppapi/proxy/ppb_flash_file_proxy.cc
@@ -20,10 +20,12 @@
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/private/ppb_flash_file.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.h"
+#include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/resource.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 
 namespace pp {
 namespace proxy {
@@ -625,13 +627,13 @@ namespace {
 int32_t OpenFileRefFile(PP_Resource file_ref_id,
                         int32_t mode,
                         PP_FileHandle* file) {
-  PluginResource* file_ref =
-      PluginResourceTracker::GetInstance()->GetResourceObject(file_ref_id);
+  Resource* file_ref =
+      PluginResourceTracker::GetInstance()->GetResource(file_ref_id);
   if (!file_ref)
     return PP_ERROR_BADRESOURCE;
 
   PluginDispatcher* dispatcher =
-      PluginDispatcher::GetForInstance(file_ref->instance());
+      PluginDispatcher::GetForInstance(file_ref->pp_instance());

[dmichael (off chromium), 2011/08/17 16:28:07]

Here's one of those places you could've used GetForResource but didn't.

   if (!dispatcher)
     return PP_ERROR_BADARGUMENT;
 
@@ -646,13 +648,13 @@ int32_t OpenFileRefFile(PP_Resource file_ref_id,
 
 int32_t QueryFileRefFile(PP_Resource file_ref_id,
                          PP_FileInfo* info) {
-  PluginResource* file_ref =
-      PluginResourceTracker::GetInstance()->GetResourceObject(file_ref_id);
+  Resource* file_ref =
+      PluginResourceTracker::GetInstance()->GetResource(file_ref_id);
   if (!file_ref)
     return PP_ERROR_BADRESOURCE;
 
   PluginDispatcher* dispatcher =
-      PluginDispatcher::GetForInstance(file_ref->instance());
+      PluginDispatcher::GetForInstance(file_ref->pp_instance());

[dmichael (off chromium), 2011/08/17 16:28:07]

ditto

   if (!dispatcher)
     return PP_ERROR_BADARGUMENT;