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

ppapi/proxy/ppb_testing_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_testing_proxy.h"
 
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppb_testing_dev.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 {
 
 PP_Bool ReadImageData(PP_Resource graphics_2d,
                       PP_Resource image,
                       const PP_Point* top_left) {
-  PluginResource* image_object = PluginResourceTracker::GetInstance()->
-      GetResourceObject(image);
+  Resource* image_object = PluginResourceTracker::GetInstance()->
+      GetResource(image);
   if (!image_object)
     return PP_FALSE;
-  PluginResource* graphics_2d_object =
-      PluginResourceTracker::GetInstance()->GetResourceObject(graphics_2d);
+  Resource* graphics_2d_object =
+      PluginResourceTracker::GetInstance()->GetResource(graphics_2d);
   if (!graphics_2d_object ||
-      image_object->instance() != graphics_2d_object->instance())
+      image_object->pp_instance() != graphics_2d_object->pp_instance())
     return PP_FALSE;
 
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(
-      image_object->instance());
+      image_object->pp_instance());
   if (!dispatcher)
     return PP_FALSE;
 
   PP_Bool result = PP_FALSE;
   dispatcher->Send(new PpapiHostMsg_PPBTesting_ReadImageData(
       INTERFACE_ID_PPB_TESTING, graphics_2d_object->host_resource(),
       image_object->host_resource(), *top_left, &result));
   return result;
 }
 
@@ skipping 82 matching lines @@
   ppb_testing_target()->QuitMessageLoop(instance);
 }
 
 void PPB_Testing_Proxy::OnMsgGetLiveObjectsForInstance(PP_Instance instance,
                                                        uint32_t* result) {
   *result = ppb_testing_target()->GetLiveObjectsForInstance(instance);
 }
 
 }  // namespace proxy
 }  // namespace pp