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

ppapi/proxy/ppb_flash_file_proxy.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 "ppapi/proxy/ppb_flash_file_proxy.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sync_message.h"
 #include "ppapi/c/pp_errors.h"
 #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 {
 
 namespace {
 
 // Given an error code and a handle result from a Pepper API call, converts to a
 // PlatformFileForTransit by sharing with the other side, closing the original
 // handle, possibly also updating the error value if an error occurred.
 IPC::PlatformFileForTransit PlatformFileToPlatformFileForTransit(
@@ skipping 581 matching lines @@
   ppb_flash_file_module_local_target()->FreeDirContents(instance, contents);
 }
 
 // PPB_Flash_File_FileRef ------------------------------------------------------
 
 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;
 
   int32_t result = PP_ERROR_FAILED;
   IPC::PlatformFileForTransit transit;
   dispatcher->Send(new PpapiHostMsg_PPBFlashFile_FileRef_OpenFile(
       INTERFACE_ID_PPB_FLASH_FILE_FILEREF,
       file_ref->host_resource(), mode, &transit, &result));
   *file = IPC::PlatformFileForTransitToPlatformFile(transit);
   return result;
 }
 
 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;
 
   int32_t result = PP_ERROR_FAILED;
   dispatcher->Send(new PpapiHostMsg_PPBFlashFile_FileRef_QueryFile(
       INTERFACE_ID_PPB_FLASH_FILE_FILEREF,
       file_ref->host_resource(), info, &result));
   return result;
 }
 
@@ skipping 59 matching lines @@
 void PPB_Flash_File_FileRef_Proxy::OnMsgQueryFile(
     const HostResource& host_resource,
     PP_FileInfo* info,
     int32_t* result) {
   *result = ppb_flash_file_module_local_target()->
       QueryFile(host_resource.host_resource(), info);
 }
 
 }  // namespace proxy
 }  // namespace pp