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

ppapi/proxy/ppb_testing_proxy.cc

Index: ppapi/proxy/ppb_testing_proxy.cc
diff --git a/ppapi/proxy/ppb_testing_proxy.cc b/ppapi/proxy/ppb_testing_proxy.cc
index 7a1f7fdc3b061312cdf7f3a392d17547bd495ef0..0e6ed6d61ae498f9cb49dc39ee33824a8466ae1d 100644
--- a/ppapi/proxy/ppb_testing_proxy.cc
+++ b/ppapi/proxy/ppb_testing_proxy.cc
@@ -7,11 +7,12 @@
 #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 {
@@ -21,18 +22,18 @@ 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;