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

ppapi/thunk/enter.h

 // 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.
 
 #ifndef PPAPI_THUNK_ENTER_H_
 #define PPAPI_THUNK_ENTER_H_
 
 #include "base/basictypes.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/interface_id.h"
 #include "ppapi/shared_impl/function_group_base.h"
-#include "ppapi/shared_impl/resource_object_base.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/tracker_base.h"
+#include "ppapi/shared_impl/resource_tracker.h"
 
 namespace ppapi {
 namespace thunk {
 
 // EnterHost* helper objects: These objects wrap a call from the C PPAPI into
 // the internal implementation. They make sure the lock is acquired and will
 // automatically set up some stuff for you.
 //
 // You should always check whether the enter succeeded before using the object.
 // If this fails, then the instance or resource ID supplied was invalid.
@@ skipping 46 matching lines @@
     // TODO(brettw) assert the lock is held.
   }
 };
 
 // Used when a caller has a resource, and wants to do EnterFunction for the
 // instance corresponding to that resource.
 template<typename FunctionsT>
 class EnterFunctionGivenResource : public EnterFunction<FunctionsT> {
  public:
   EnterFunctionGivenResource(PP_Resource resource, bool report_error)
-      : EnterFunction<FunctionsT>(
-            TrackerBase::Get()->GetInstanceForResource(resource),
-            report_error) {
+      : EnterFunction<FunctionsT>(GetInstanceForResource(resource),
+                                  report_error) {
+  }
+
+ private:
+  static PP_Instance GetInstanceForResource(PP_Resource resource) {
+    Resource* object =
+        TrackerBase::Get()->GetResourceTracker()->GetResource(resource);
+    return object ? object->pp_instance() : 0;
   }
 };
 
 // EnterResource ---------------------------------------------------------------
 
 template<typename ResourceT>
 class EnterResource {
  public:
   EnterResource(PP_Resource resource, bool report_error)
       : object_(NULL) {
-    ResourceObjectBase* base = TrackerBase::Get()->GetResourceAPI(resource);
+    Resource* base =
+        TrackerBase::Get()->GetResourceTracker()->GetResource(resource);
     if (base)
       object_ = base->GetAs<ResourceT>();
     // TODO(brettw) check error and if report_error is set, do something.
   }
   ~EnterResource() {}
 
   bool succeeded() const { return !!object_; }
   bool failed() const { return !object_; }
 
   ResourceT* object() { return object_; }
@@ skipping 12 matching lines @@
   EnterResourceNoLock(PP_Resource resource, bool report_error)
       : EnterResource<ResourceT>(resource, report_error) {
     // TODO(brettw) assert the lock is held.
   }
 };
 
 }  // namespace thunk
 }  // namespace ppapi
 
 #endif  // PPAPI_THUNK_ENTER_H_