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

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/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
+#include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/shared_impl/resource_tracker.h"
-#include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
 namespace thunk {
 
 // Enter* 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.
@@ skipping 83 matching lines @@
 class EnterFunctionGivenResource : public EnterFunction<FunctionsT> {
  public:
   EnterFunctionGivenResource(PP_Resource resource, bool report_error)
       : EnterFunction<FunctionsT>(GetInstanceForResource(resource),
                                   report_error) {
   }
 
  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;
   }
 };
 
 // EnterResource ---------------------------------------------------------------
 
 template<typename ResourceT, bool lock_on_entry = true>
 class EnterResource : subtle::LockOnEntry<lock_on_entry> {
  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.
   }
   ~EnterResource() {}
 
   bool succeeded() const { return !!object_; }
   bool failed() const { return !object_; }
 
   ResourceT* object() { return object_; }
@@ skipping 32 matching lines @@
     : public EnterFunctionNoLock<PPB_Instance_FunctionAPI> {
  public:
   EnterInstance(PP_Instance instance);
   ~EnterInstance();
 };
 
 }  // namespace thunk
 }  // namespace ppapi
 
 #endif  // PPAPI_THUNK_ENTER_H_