Revert 106142 - Add a new globals object for PPAPI tracking information.

ppapi/thunk/enter.h

Index: ppapi/thunk/enter.h
===================================================================
--- ppapi/thunk/enter.h	(revision 106147)
+++ ppapi/thunk/enter.h	(working copy)
@@ -9,11 +9,10 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/interface_id.h"
 #include "ppapi/shared_impl/function_group_base.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
-#include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/tracker_base.h"
+#include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
@@ -117,7 +116,7 @@
  private:
   static PP_Instance GetInstanceForResource(PP_Resource resource) {
     Resource* object =
-        PpapiGlobals::Get()->GetResourceTracker()->GetResource(resource);
+        TrackerBase::Get()->GetResourceTracker()->GetResource(resource);
     return object ? object->pp_instance() : 0;
   }
 };
@@ -129,8 +128,7 @@
  public:
   EnterResource(PP_Resource resource, bool report_error)
       : object_(NULL) {
-    resource_ =
-        PpapiGlobals::Get()->GetResourceTracker()->GetResource(resource);
+    resource_ = TrackerBase::Get()->GetResourceTracker()->GetResource(resource);
     if (resource_)
       object_ = resource_->GetAs<ResourceT>();
     // TODO(brettw) check error and if report_error is set, do something.
Property changes on: ppapi/thunk/enter.h
___________________________________________________________________
Added: svn:mergeinfo