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

This adds a specialization on the host and plugin side of the proxy. This
replaces the ad-hoc singleton tracking done by the resource and var trackers
with just being getters on this global object.

Most code can use the single PpapiGlobals class. I also allow code to get the
host and plugin specializations since some code needs access to some specific
features of each side.

In a later pass I'll move the other stuff out of TrackerBase and delete it.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/8316008

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8342016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106148 0039d316-1c4b-4281-b951-d872f2087c98

26 files changed, 145 insertions, 187 deletions

diff --git a/ppapi/proxy/enter_proxy.h b/ppapi/proxy/enter_proxy.h
index 96ac0c18..d7bf7c2 100644
--- a/ppapi/proxy/enter_proxy.h
+++ b/ppapi/proxy/enter_proxy.h
@@ -9,7 +9,6 @@
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/thunk/enter.h"
 
@@ -33,8 +32,8 @@ class EnterPluginFromHostResource
  public:
   EnterPluginFromHostResource(const HostResource& host_resource)
       : thunk::EnterResourceNoLock<ResourceT>(
-            PluginGlobals::Get()->plugin_resource_tracker()->
-                PluginResourceForHostResource(host_resource),
+            PluginResourceTracker::GetInstance()->PluginResourceForHostResource(
+                host_resource),
             false) {
     // Validate that we're in the plugin rather than the host. Otherwise this
     // object will do the wrong thing. In the plugin, the instance should have
diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc
deleted file mode 100644
index 888c3bd..0000000
--- a/ppapi/proxy/plugin_globals.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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/plugin_globals.h"
-
-namespace ppapi {
-namespace proxy {
-
-PluginGlobals* PluginGlobals::plugin_globals_ = NULL;
-
-PluginGlobals::PluginGlobals() : ppapi::PpapiGlobals() {
-  DCHECK(!plugin_globals_);
-  plugin_globals_ = this;
-}
-
-PluginGlobals::~PluginGlobals() {
-  DCHECK(plugin_globals_ == this);
-  plugin_globals_ = NULL;
-}
-
-ResourceTracker* PluginGlobals::GetResourceTracker() {
-  return &plugin_resource_tracker_;
-}
-
-VarTracker* PluginGlobals::GetVarTracker() {
-  return &plugin_var_tracker_;
-}
-
-}  // namespace proxy
-}  // namespace ppapi
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h
deleted file mode 100644
index 141b904..0000000
--- a/ppapi/proxy/plugin_globals.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// 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_PROXY_PLUGIN_GLOBALS_H_
-#define PPAPI_PROXY_PLUGIN_GLOBALS_H_
-
-#include "base/compiler_specific.h"
-#include "ppapi/proxy/plugin_resource_tracker.h"
-#include "ppapi/proxy/plugin_var_tracker.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
-
-namespace ppapi {
-namespace proxy {
-
-class PluginGlobals : public PpapiGlobals {
- public:
-  PluginGlobals();
-  virtual ~PluginGlobals();
-
-  // Getter for the global singleton. Generally, you should use
-  // PpapiGlobals::Get() when possible. Use this only when you need some
-  // plugin-specific functionality.
-  inline static PluginGlobals* Get() { return plugin_globals_; }
-
-  // PpapiGlobals implementation.
-  virtual ResourceTracker* GetResourceTracker() OVERRIDE;
-  virtual VarTracker* GetVarTracker() OVERRIDE;
-
-  // Getters for the plugin-specific versions.
-  PluginResourceTracker* plugin_resource_tracker() {
-    return &plugin_resource_tracker_;
-  }
-  PluginVarTracker* plugin_var_tracker() {
-    return &plugin_var_tracker_;
-  }
-
- private:
-  static PluginGlobals* plugin_globals_;
-
-  PluginResourceTracker plugin_resource_tracker_;
-  PluginVarTracker plugin_var_tracker_;
-
-  DISALLOW_COPY_AND_ASSIGN(PluginGlobals);
-};
-
-}  // namespace proxy
-}  // namespace ppapi
-
-#endif   // PPAPI_PROXY_PLUGIN_GLOBALS_H_
diff --git a/ppapi/proxy/plugin_resource_tracker.cc b/ppapi/proxy/plugin_resource_tracker.cc
index 67e2d69..4abd8f7 100644
--- a/ppapi/proxy/plugin_resource_tracker.cc
+++ b/ppapi/proxy/plugin_resource_tracker.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/proxy_lock.h"
@@ -20,13 +19,17 @@ namespace proxy {
 
 namespace {
 
+// When non-NULL, this object overrides the ResourceTrackerSingleton.
+PluginResourceTracker* g_resource_tracker_override = NULL;
+
 TrackerBase* GetTrackerBase() {
-  return PluginGlobals::Get()->plugin_resource_tracker();
+  return PluginResourceTracker::GetInstance();
 }
 
 }  // namespace
 
-PluginResourceTracker::PluginResourceTracker() {
+PluginResourceTracker::PluginResourceTracker()
+    : var_tracker_test_override_(NULL) {
 #ifdef ENABLE_PEPPER_THREADING
   // Set the global proxy lock, since the plugin-side of the proxy needs to be
   // synchronized.
@@ -41,8 +44,20 @@ PluginResourceTracker::~PluginResourceTracker() {
 }
 
 // static
+void PluginResourceTracker::SetInstanceForTest(PluginResourceTracker* tracker) {
+  g_resource_tracker_override = tracker;
+}
+
+// static
+PluginResourceTracker* PluginResourceTracker::GetInstance() {
+  if (g_resource_tracker_override)
+    return g_resource_tracker_override;
+  return Singleton<PluginResourceTracker>::get();
+}
+
+// static
 TrackerBase* PluginResourceTracker::GetTrackerBaseInstance() {
-  return GetTrackerBase();
+  return GetInstance();
 }
 
 PP_Resource PluginResourceTracker::PluginResourceForHostResource(
@@ -61,6 +76,14 @@ FunctionGroupBase* PluginResourceTracker::GetFunctionAPI(PP_Instance inst,
   return NULL;
 }
 
+VarTracker* PluginResourceTracker::GetVarTracker() {
+  return &var_tracker();
+}
+
+ResourceTracker* PluginResourceTracker::GetResourceTracker() {
+  return this;
+}
+
 PP_Module PluginResourceTracker::GetModuleForInstance(PP_Instance instance) {
   // Currently proxied plugins don't use the PP_Module for anything useful.
   return 0;
diff --git a/ppapi/proxy/plugin_resource_tracker.h b/ppapi/proxy/plugin_resource_tracker.h
index cf87787..30fafb2 100644
--- a/ppapi/proxy/plugin_resource_tracker.h
+++ b/ppapi/proxy/plugin_resource_tracker.h
@@ -15,6 +15,7 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/shared_impl/resource_tracker.h"
@@ -33,9 +34,13 @@ class PluginDispatcher;
 class PPAPI_PROXY_EXPORT PluginResourceTracker : public TrackerBase,
                                                  public ResourceTracker {
  public:
-  PluginResourceTracker();
-  virtual ~PluginResourceTracker();
+  // Called by tests that want to specify a specific ResourceTracker. This
+  // allows them to use a unique one each time and avoids singletons sticking
+  // around across tests.
+  static void SetInstanceForTest(PluginResourceTracker* tracker);
 
+  // Returns the global singleton resource tracker for the plugin.
+  static PluginResourceTracker* GetInstance();
   static TrackerBase* GetTrackerBaseInstance();
 
   // Given a host resource, maps it to an existing plugin resource ID if it
@@ -43,9 +48,20 @@ class PPAPI_PROXY_EXPORT PluginResourceTracker : public TrackerBase,
   PP_Resource PluginResourceForHostResource(
       const HostResource& resource) const;
 
+  PluginVarTracker& var_tracker() {
+    return var_tracker_test_override_ ? *var_tracker_test_override_
+                                      : var_tracker_;
+  }
+
+  void set_var_tracker_test_override(PluginVarTracker* t) {
+    var_tracker_test_override_ = t;
+  }
+
   // TrackerBase.
   virtual FunctionGroupBase* GetFunctionAPI(PP_Instance inst,
                                             InterfaceID id) OVERRIDE;
+  virtual VarTracker* GetVarTracker() OVERRIDE;
+  virtual ResourceTracker* GetResourceTracker() OVERRIDE;
   virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
 
  protected:
@@ -54,6 +70,24 @@ class PPAPI_PROXY_EXPORT PluginResourceTracker : public TrackerBase,
   virtual void RemoveResource(Resource* object) OVERRIDE;
 
  private:
+  friend struct DefaultSingletonTraits<PluginResourceTracker>;
+  friend class PluginResourceTrackerTest;
+  friend class PluginProxyTestHarness;
+
+  PluginResourceTracker();
+  virtual ~PluginResourceTracker();
+
+  // Use the var_tracker_test_override_ instead if it's non-NULL.
+  //
+  // TODO(brettw) this should be somehow separated out from here. I'm thinking
+  // of some global object that manages PPAPI globals, including separate var
+  // and resource trackers.
+  PluginVarTracker var_tracker_;
+
+  // Non-owning pointer to a var tracker mock used by tests. NULL when no
+  // test implementation is provided.
+  PluginVarTracker* var_tracker_test_override_;
+
   // Map of host instance/resource pairs to a plugin resource ID.
   typedef std::map<HostResource, PP_Resource> HostResourceMap;
   HostResourceMap host_resource_map_;
diff --git a/ppapi/proxy/plugin_var_serialization_rules.cc b/ppapi/proxy/plugin_var_serialization_rules.cc
index 3d9975a..49e1fc3 100644
--- a/ppapi/proxy/plugin_var_serialization_rules.cc
+++ b/ppapi/proxy/plugin_var_serialization_rules.cc
@@ -6,17 +6,15 @@
 
 #include "base/logging.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var.h"
 
 namespace ppapi {
 namespace proxy {
 
 PluginVarSerializationRules::PluginVarSerializationRules()
-    : var_tracker_(PluginGlobals::Get()->plugin_var_tracker()) {
+    : var_tracker_(&PluginResourceTracker::GetInstance()->var_tracker()) {
 }
 
 PluginVarSerializationRules::~PluginVarSerializationRules() {
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 484253b..1c7233c 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -151,7 +151,9 @@ Dispatcher* PluginProxyTestHarness::GetDispatcher() {
 
 void PluginProxyTestHarness::SetUpHarness() {
   // These must be first since the dispatcher set-up uses them.
-  resource_tracker().DidCreateInstance(pp_instance());
+  resource_tracker_.DidCreateInstance(pp_instance());
+  PluginResourceTracker::SetInstanceForTest(&resource_tracker_);
+  resource_tracker_.set_var_tracker_test_override(&var_tracker_);
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       base::Process::Current().handle(),
@@ -166,7 +168,9 @@ void PluginProxyTestHarness::SetUpHarnessWithChannel(
     base::WaitableEvent* shutdown_event,
     bool is_client) {
   // These must be first since the dispatcher set-up uses them.
-  resource_tracker().DidCreateInstance(pp_instance());
+  resource_tracker_.DidCreateInstance(pp_instance());
+  PluginResourceTracker::SetInstanceForTest(&resource_tracker_);
+  resource_tracker_.set_var_tracker_test_override(&var_tracker_);
   plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
 
   plugin_dispatcher_.reset(new PluginDispatcher(
@@ -182,7 +186,8 @@ void PluginProxyTestHarness::TearDownHarness() {
   plugin_dispatcher_->DidDestroyInstance(pp_instance());
   plugin_dispatcher_.reset();
 
-  resource_tracker().DidDeleteInstance(pp_instance());
+  resource_tracker_.DidDeleteInstance(pp_instance());
+  PluginResourceTracker::SetInstanceForTest(NULL);
 }
 
 base::MessageLoopProxy*
diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h
index cf71a5e..03ec57d 100644
--- a/ppapi/proxy/ppapi_proxy_test.h
+++ b/ppapi/proxy/ppapi_proxy_test.h
@@ -13,7 +13,6 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -79,12 +78,8 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase {
   virtual ~PluginProxyTestHarness();
 
   PluginDispatcher* plugin_dispatcher() { return plugin_dispatcher_.get(); }
-  PluginResourceTracker& resource_tracker() {
-    return *plugin_globals_.plugin_resource_tracker();
-  }
-  PluginVarTracker& var_tracker() {
-    return *plugin_globals_.plugin_var_tracker();
-  }
+  PluginResourceTracker& resource_tracker() { return resource_tracker_; }
+  PluginVarTracker& var_tracker() { return var_tracker_; }
 
   // ProxyTestHarnessBase implementation.
   virtual Dispatcher* GetDispatcher();
@@ -128,8 +123,8 @@ class PluginProxyTestHarness : public ProxyTestHarnessBase {
   };
 
  private:
-  PluginGlobals plugin_globals_;
-
+  PluginResourceTracker resource_tracker_;
+  PluginVarTracker var_tracker_;
   scoped_ptr<PluginDispatcher> plugin_dispatcher_;
   PluginDelegateMock plugin_delegate_mock_;
 };
diff --git a/ppapi/proxy/ppb_audio_proxy.cc b/ppapi/proxy/ppb_audio_proxy.cc
index f1aedf7..453d7b0 100644
--- a/ppapi/proxy/ppb_audio_proxy.cc
+++ b/ppapi/proxy/ppb_audio_proxy.cc
@@ -16,7 +16,6 @@
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/audio_impl.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 #include "ppapi/thunk/enter.h"
@@ -65,11 +64,11 @@ Audio::Audio(const HostResource& audio_id,
     : Resource(audio_id),
       config_(config_id) {
   SetCallback(callback, user_data);
-  PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(config_);
+  PluginResourceTracker::GetInstance()->AddRefResource(config_);
 }
 
 Audio::~Audio() {
-  PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(config_);
+  PluginResourceTracker::GetInstance()->ReleaseResource(config_);
 }
 
 PPB_Audio_API* Audio::AsPPB_Audio_API() {
@@ -78,7 +77,7 @@ PPB_Audio_API* Audio::AsPPB_Audio_API() {
 
 PP_Resource Audio::GetCurrentConfig() {
   // AddRef for the caller.
-  PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(config_);
+  PluginResourceTracker::GetInstance()->AddRefResource(config_);
   return config_;
 }
 
diff --git a/ppapi/proxy/ppb_core_proxy.cc b/ppapi/proxy/ppb_core_proxy.cc
index c01eb45..9173df6 100644
--- a/ppapi/proxy/ppb_core_proxy.cc
+++ b/ppapi/proxy/ppb_core_proxy.cc
@@ -18,7 +18,6 @@
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/time_conversion.h"
 
@@ -35,12 +34,12 @@ base::MessageLoopProxy* GetMainThreadMessageLoop() {
 
 void AddRefResource(PP_Resource resource) {
   ppapi::ProxyAutoLock lock;
-  PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(resource);
+  PluginResourceTracker::GetInstance()->AddRefResource(resource);
 }
 
 void ReleaseResource(PP_Resource resource) {
   ppapi::ProxyAutoLock lock;
-  PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(resource);
+  PluginResourceTracker::GetInstance()->ReleaseResource(resource);
 }
 
 double GetTime() {
diff --git a/ppapi/proxy/ppb_cursor_control_proxy.cc b/ppapi/proxy/ppb_cursor_control_proxy.cc
index 960c010..a0b0ee8 100644
--- a/ppapi/proxy/ppb_cursor_control_proxy.cc
+++ b/ppapi/proxy/ppb_cursor_control_proxy.cc
@@ -9,7 +9,6 @@
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 
@@ -38,8 +37,8 @@ PP_Bool PPB_CursorControl_Proxy::SetCursor(PP_Instance instance,
   // It's legal for the image ID to be null if the type is not custom.
   HostResource cursor_image_resource;
   if (type == PP_CURSORTYPE_CUSTOM) {
-    Resource* cursor_image =
-        PpapiGlobals::Get()->GetResourceTracker()->GetResource(custom_image_id);
+    Resource* cursor_image = PluginResourceTracker::GetInstance()->
+        GetResource(custom_image_id);
     if (!cursor_image || cursor_image->pp_instance() != instance)
       return PP_FALSE;
     cursor_image_resource = cursor_image->host_resource();
diff --git a/ppapi/proxy/ppb_file_chooser_proxy.cc b/ppapi/proxy/ppb_file_chooser_proxy.cc
index 1e55af6..1c7907c 100644
--- a/ppapi/proxy/ppb_file_chooser_proxy.cc
+++ b/ppapi/proxy/ppb_file_chooser_proxy.cc
@@ -17,8 +17,6 @@
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_file_ref_proxy.h"
 #include "ppapi/proxy/serialized_var.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
@@ -89,7 +87,7 @@ FileChooser::~FileChooser() {
 
   // Any existing files we haven't transferred ownership to the plugin need
   // to be freed.
-  ResourceTracker* tracker = PpapiGlobals::Get()->GetResourceTracker();
+  PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
   while (!file_queue_.empty()) {
     tracker->ReleaseResource(file_queue_.front());
     file_queue_.pop();
diff --git a/ppapi/proxy/ppb_file_ref_proxy.cc b/ppapi/proxy/ppb_file_ref_proxy.cc
index c9824a4..49a1131 100644
--- a/ppapi/proxy/ppb_file_ref_proxy.cc
+++ b/ppapi/proxy/ppb_file_ref_proxy.cc
@@ -90,7 +90,7 @@ int32_t FileRef::Delete(PP_CompletionCallback callback) {
 int32_t FileRef::Rename(PP_Resource new_file_ref,
                         PP_CompletionCallback callback) {
   Resource* new_file_ref_object =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(new_file_ref);
+      PluginResourceTracker::GetInstance()->GetResource(new_file_ref);
   if (!new_file_ref_object ||
       new_file_ref_object->host_resource().instance() != pp_instance())
     return PP_ERROR_BADRESOURCE;
@@ -113,7 +113,7 @@ PPB_FileRef_Proxy::~PPB_FileRef_Proxy() {
 PP_Resource PPB_FileRef_Proxy::CreateProxyResource(PP_Resource file_system,
                                                    const char* path) {
   Resource* file_system_object =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(file_system);
+      PluginResourceTracker::GetInstance()->GetResource(file_system);
   if (!file_system_object)
     return 0;
 
diff --git a/ppapi/proxy/ppb_flash_file_proxy.cc b/ppapi/proxy/ppb_flash_file_proxy.cc
index de5a40c..fa636aa 100644
--- a/ppapi/proxy/ppb_flash_file_proxy.cc
+++ b/ppapi/proxy/ppb_flash_file_proxy.cc
@@ -21,10 +21,9 @@
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/private/ppb_flash_file.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource.h"
-#include "ppapi/shared_impl/resource_tracker.h"
 
 namespace ppapi {
 namespace proxy {
@@ -632,7 +631,7 @@ int32_t OpenFileRefFile(PP_Resource file_ref_id,
                         int32_t mode,
                         PP_FileHandle* file) {
   Resource* file_ref =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(file_ref_id);
+      PluginResourceTracker::GetInstance()->GetResource(file_ref_id);
   if (!file_ref)
     return PP_ERROR_BADRESOURCE;
 
@@ -652,7 +651,7 @@ int32_t OpenFileRefFile(PP_Resource file_ref_id,
 int32_t QueryFileRefFile(PP_Resource file_ref_id,
                          PP_FileInfo* info) {
   Resource* file_ref =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(file_ref_id);
+      PluginResourceTracker::GetInstance()->GetResource(file_ref_id);
   if (!file_ref)
     return PP_ERROR_BADRESOURCE;
 
diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc
index b1d0d22..1faae86 100644
--- a/ppapi/proxy/ppb_flash_proxy.cc
+++ b/ppapi/proxy/ppb_flash_proxy.cc
@@ -14,12 +14,11 @@
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/proxy_module.h"
 #include "ppapi/proxy/serialized_var.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource.h"
-#include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
@@ -49,8 +48,8 @@ PP_Bool DrawGlyphs(PP_Instance instance,
                    uint32_t glyph_count,
                    const uint16_t glyph_indices[],
                    const PP_Point glyph_advances[]) {
-  Resource* image_data =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(pp_image_data);
+  Resource* image_data = PluginResourceTracker::GetInstance()->GetResource(
+      pp_image_data);
   if (!image_data)
     return PP_FALSE;
   // The instance parameter isn't strictly necessary but we check that it
diff --git a/ppapi/proxy/ppb_graphics_2d_proxy.cc b/ppapi/proxy/ppb_graphics_2d_proxy.cc
index 7bed679..dcf8d26 100644
--- a/ppapi/proxy/ppb_graphics_2d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_2d_proxy.cc
@@ -87,8 +87,8 @@ PP_Bool Graphics2D::Describe(PP_Size* size, PP_Bool* is_always_opaque) {
 void Graphics2D::PaintImageData(PP_Resource image_data,
                                 const PP_Point* top_left,
                                 const PP_Rect* src_rect) {
-  Resource* image_object =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(image_data);
+  Resource* image_object = PluginResourceTracker::GetInstance()->
+      GetResource(image_data);
   if (!image_object || pp_instance() != image_object->pp_instance())
     return;
 
@@ -110,8 +110,8 @@ void Graphics2D::Scroll(const PP_Rect* clip_rect,
 }
 
 void Graphics2D::ReplaceContents(PP_Resource image_data) {
-  Resource* image_object =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(image_data);
+  Resource* image_object = PluginResourceTracker::GetInstance()->
+      GetResource(image_data);
   if (!image_object || pp_instance() != image_object->pp_instance())
     return;
 
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 7604eed..1a99b47 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -11,9 +11,9 @@
 #include "ppapi/c/ppb_mouse_lock.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/url_util_impl.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
@@ -123,8 +123,7 @@ PPB_Instance_FunctionAPI* PPB_Instance_Proxy::AsPPB_Instance_FunctionAPI() {
 
 PP_Bool PPB_Instance_Proxy::BindGraphics(PP_Instance instance,
                                          PP_Resource device) {
-  Resource* object =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(device);
+  Resource* object = PluginResourceTracker::GetInstance()->GetResource(device);
   if (!object || object->pp_instance() != instance)
     return PP_FALSE;
 
diff --git a/ppapi/proxy/ppb_testing_proxy.cc b/ppapi/proxy/ppb_testing_proxy.cc
index 470d3da..836e1cf 100644
--- a/ppapi/proxy/ppb_testing_proxy.cc
+++ b/ppapi/proxy/ppb_testing_proxy.cc
@@ -7,10 +7,9 @@
 #include "base/message_loop.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/resource.h"
-#include "ppapi/shared_impl/resource_tracker.h"
 
 namespace ppapi {
 namespace proxy {
@@ -20,12 +19,12 @@ namespace {
 PP_Bool ReadImageData(PP_Resource graphics_2d,
                       PP_Resource image,
                       const PP_Point* top_left) {
-  Resource* image_object =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(image);
+  Resource* image_object = PluginResourceTracker::GetInstance()->
+      GetResource(image);
   if (!image_object)
     return PP_FALSE;
   Resource* graphics_2d_object =
-      PpapiGlobals::Get()->GetResourceTracker()->GetResource(graphics_2d);
+      PluginResourceTracker::GetInstance()->GetResource(graphics_2d);
   if (!graphics_2d_object ||
       image_object->pp_instance() != graphics_2d_object->pp_instance())
     return PP_FALSE;
diff --git a/ppapi/proxy/ppb_url_loader_proxy.cc b/ppapi/proxy/ppb_url_loader_proxy.cc
index 2ad3025..70c01e8 100644
--- a/ppapi/proxy/ppb_url_loader_proxy.cc
+++ b/ppapi/proxy/ppb_url_loader_proxy.cc
@@ -172,7 +172,7 @@ URLLoader::~URLLoader() {
   }
 
   if (response_info_)
-    PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(response_info_);
+    PluginResourceTracker::GetInstance()->ReleaseResource(response_info_);
 }
 
 PPB_URLLoader_API* URLLoader::AsPPB_URLLoader_API() {
@@ -240,7 +240,7 @@ PP_Resource URLLoader::GetResponseInfo() {
   }
 
   // The caller expects to get a ref, and we want to keep holding ours.
-  PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(response_info_);
+  PluginResourceTracker::GetInstance()->AddRefResource(response_info_);
   return response_info_;
 }
 
diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc
index 892fba1..6475580 100644
--- a/ppapi/proxy/ppb_var_deprecated_proxy.cc
+++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc
@@ -15,7 +15,6 @@
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ -42,9 +41,8 @@ PluginDispatcher* CheckExceptionAndGetDispatcher(const PP_Var& object,
 
   if (object.type == PP_VARTYPE_OBJECT) {
     // Get the dispatcher for the object.
-    PluginDispatcher* dispatcher =
-        PluginGlobals::Get()->plugin_var_tracker()->
-            DispatcherForPluginObject(object);
+    PluginDispatcher* dispatcher = PluginResourceTracker::GetInstance()->
+        var_tracker().DispatcherForPluginObject(object);
     if (dispatcher)
       return dispatcher;
   }
@@ -61,11 +59,11 @@ PluginDispatcher* CheckExceptionAndGetDispatcher(const PP_Var& object,
 // PPB_Var_Deprecated plugin ---------------------------------------------------
 
 void AddRefVar(PP_Var var) {
-  PpapiGlobals::Get()->GetVarTracker()->AddRefVar(var);
+  PluginResourceTracker::GetInstance()->var_tracker().AddRefVar(var);
 }
 
 void ReleaseVar(PP_Var var) {
-  PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(var);
+  PluginResourceTracker::GetInstance()->var_tracker().ReleaseVar(var);
 }
 
 PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) {
diff --git a/ppapi/proxy/ppb_var_proxy.cc b/ppapi/proxy/ppb_var_proxy.cc
index 4301234..0c7cf5b 100644
--- a/ppapi/proxy/ppb_var_proxy.cc
+++ b/ppapi/proxy/ppb_var_proxy.cc
@@ -6,10 +6,10 @@
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_var.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
+#include "ppapi/proxy/plugin_resource_tracker.h"
+#include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/var.h"
-#include "ppapi/shared_impl/var_tracker.h"
 
 namespace ppapi {
 namespace proxy {
@@ -20,12 +20,12 @@ namespace {
 
 void AddRefVar(PP_Var var) {
   ppapi::ProxyAutoLock lock;
-  PpapiGlobals::Get()->GetVarTracker()->AddRefVar(var);
+  PluginResourceTracker::GetInstance()->var_tracker().AddRefVar(var);
 }
 
 void ReleaseVar(PP_Var var) {
   ppapi::ProxyAutoLock lock;
-  PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(var);
+  PluginResourceTracker::GetInstance()->var_tracker().ReleaseVar(var);
 }
 
 PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) {
diff --git a/ppapi/proxy/ppb_video_capture_proxy.cc b/ppapi/proxy/ppb_video_capture_proxy.cc
index c771bf5..9f40c1f 100644
--- a/ppapi/proxy/ppb_video_capture_proxy.cc
+++ b/ppapi/proxy/ppb_video_capture_proxy.cc
@@ -373,11 +373,11 @@ void PPP_VideoCapture_Proxy::OnMsgOnDeviceInfo(
     const PP_VideoCaptureDeviceInfo_Dev& info,
     const std::vector<PPPVideoCapture_Buffer>& buffers) {
   EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
-  if (enter.failed() || !ppp_video_capture_impl_)
+  PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
+  PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
+  if (!resource || !ppp_video_capture_impl_ || enter.failed())
     return;
 
-  PluginResourceTracker* tracker =
-      PluginGlobals::Get()->plugin_resource_tracker();
   scoped_array<PP_Resource> resources(new PP_Resource[buffers.size()]);
   for (size_t i = 0; i < buffers.size(); ++i) {
     // We assume that the browser created a new set of resources.
@@ -386,12 +386,10 @@ void PPP_VideoCapture_Proxy::OnMsgOnDeviceInfo(
                                                       buffers[i].handle,
                                                       buffers[i].size);
   }
-
-  VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
-  capture->SetBufferCount(buffers.size());
+  static_cast<VideoCapture*>(enter.object())->SetBufferCount(buffers.size());
   ppp_video_capture_impl_->OnDeviceInfo(
       host_resource.instance(),
-      capture->pp_resource(),
+      resource,
       &info,
       buffers.size(),
       resources.get());
@@ -402,38 +400,40 @@ void PPP_VideoCapture_Proxy::OnMsgOnDeviceInfo(
 void PPP_VideoCapture_Proxy::OnMsgOnStatus(const HostResource& host_resource,
                                            uint32_t status) {
   EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
-  if (enter.failed() || !ppp_video_capture_impl_)
+  PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
+  PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
+  if (!resource || !ppp_video_capture_impl_ || enter.failed())
     return;
 
-  VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
-  if (!capture->OnStatus(status))
+  if (!static_cast<VideoCapture*>(enter.object())->OnStatus(status))
     return;
   ppp_video_capture_impl_->OnStatus(
-      host_resource.instance(), capture->pp_resource(), status);
+      host_resource.instance(), resource, status);
 }
 
 void PPP_VideoCapture_Proxy::OnMsgOnError(const HostResource& host_resource,
                                           uint32_t error_code) {
   EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
-  if (enter.failed() || !ppp_video_capture_impl_)
+  PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
+  PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
+  if (!resource || !ppp_video_capture_impl_ || enter.failed())
     return;
-
-  VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
-  capture->set_status(PP_VIDEO_CAPTURE_STATUS_STOPPED);
+  static_cast<VideoCapture*>(enter.object())->set_status(
+      PP_VIDEO_CAPTURE_STATUS_STOPPED);
   ppp_video_capture_impl_->OnError(
-      host_resource.instance(), capture->pp_resource(), error_code);
+      host_resource.instance(), resource, error_code);
 }
 
 void PPP_VideoCapture_Proxy::OnMsgOnBufferReady(
     const HostResource& host_resource, uint32_t buffer) {
   EnterPluginFromHostResource<PPB_VideoCapture_API> enter(host_resource);
-  if (enter.failed() || !ppp_video_capture_impl_)
+  PluginResourceTracker* tracker = PluginResourceTracker::GetInstance();
+  PP_Resource resource = tracker->PluginResourceForHostResource(host_resource);
+  if (!resource || !ppp_video_capture_impl_ || enter.failed())
     return;
-
-  VideoCapture* capture = static_cast<VideoCapture*>(enter.object());
-  capture->SetBufferInUse(buffer);
+  static_cast<VideoCapture*>(enter.object())->SetBufferInUse(buffer);
   ppp_video_capture_impl_->OnBufferReady(
-      host_resource.instance(), capture->pp_resource(), buffer);
+      host_resource.instance(), resource, buffer);
 }
 
 }  // namespace proxy
diff --git a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
index ea57ec1..a192154 100644
--- a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
+++ b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
@@ -156,7 +156,7 @@ TEST_F(PPP_Instance_Private_ProxyTest, PPPInstancePrivate) {
 
   // Now instance_obj is valid and should have a ref-count of 1.
   PluginVarTracker& plugin_var_tracker =
-      *PluginGlobals::Get()->plugin_var_tracker();
+      PluginResourceTracker::GetInstance()->var_tracker();
   // Check the plugin-side reference count.
   EXPECT_EQ(1, plugin_var_tracker.GetRefCountForObject(instance_obj));
   // Check the host-side var and reference count.
diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc
index 9463f28..c3e7395 100644
--- a/ppapi/proxy/ppp_instance_proxy.cc
+++ b/ppapi/proxy/ppp_instance_proxy.cc
@@ -15,7 +15,6 @@
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_url_loader_proxy.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 
 namespace ppapi {
 namespace proxy {
@@ -176,7 +175,7 @@ void PPP_Instance_Proxy::OnMsgDidCreate(
   PluginDispatcher* plugin_dispatcher =
       static_cast<PluginDispatcher*>(dispatcher());
   plugin_dispatcher->DidCreateInstance(instance);
-  PpapiGlobals::Get()->GetResourceTracker()->DidCreateInstance(instance);
+  ppapi::TrackerBase::Get()->GetResourceTracker()->DidCreateInstance(instance);
 
   // Make sure the arrays always have at least one element so we can take the
   // address below.
@@ -197,7 +196,7 @@ void PPP_Instance_Proxy::OnMsgDidCreate(
 
 void PPP_Instance_Proxy::OnMsgDidDestroy(PP_Instance instance) {
   combined_interface_->DidDestroy(instance);
-  PpapiGlobals::Get()->GetResourceTracker()->DidDeleteInstance(instance);
+  ppapi::TrackerBase::Get()->GetResourceTracker()->DidDeleteInstance(instance);
   static_cast<PluginDispatcher*>(dispatcher())->DidDestroyInstance(instance);
 }
 
@@ -236,7 +235,7 @@ void PPP_Instance_Proxy::OnMsgHandleDocumentLoad(PP_Instance instance,
   // representing all plugin references).
   // Once all references at the plugin side are released, the renderer side will
   // be notified and release the reference added in HandleDocumentLoad() above.
-  PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(plugin_loader);
+  PluginResourceTracker::GetInstance()->ReleaseResource(plugin_loader);
 }
 
 }  // namespace proxy
diff --git a/ppapi/proxy/ppp_messaging_proxy.cc b/ppapi/proxy/ppp_messaging_proxy.cc
index 60cd8c4..390794a 100644
--- a/ppapi/proxy/ppp_messaging_proxy.cc
+++ b/ppapi/proxy/ppp_messaging_proxy.cc
@@ -12,8 +12,6 @@
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/var_tracker.h"
 
 namespace ppapi {
 namespace proxy {
@@ -84,7 +82,7 @@ void PPP_Messaging_Proxy::OnMsgHandleMessage(
   PP_Var received_var(message_data.Get(dispatcher()));
   // SerializedVarReceiveInput will decrement the reference count, but we want
   // to give the recipient a reference.
-  PpapiGlobals::Get()->GetVarTracker()->AddRefVar(received_var);
+  PluginResourceTracker::GetInstance()->var_tracker().AddRefVar(received_var);
   ppp_messaging_impl_->HandleMessage(instance, received_var);
 }
 
diff --git a/ppapi/proxy/ppp_video_decoder_proxy.cc b/ppapi/proxy/ppp_video_decoder_proxy.cc
index 3852806..c115278 100644
--- a/ppapi/proxy/ppp_video_decoder_proxy.cc
+++ b/ppapi/proxy/ppp_video_decoder_proxy.cc
@@ -5,7 +5,6 @@
 #include "ppapi/proxy/ppp_video_decoder_proxy.h"
 
 #include "ppapi/proxy/host_dispatcher.h"
-#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_video_decoder_proxy.h"
@@ -132,7 +131,7 @@ bool PPP_VideoDecoder_Proxy::OnMessageReceived(const IPC::Message& msg) {
 void PPP_VideoDecoder_Proxy::OnMsgProvidePictureBuffers(
     const HostResource& decoder, uint32_t req_num_of_bufs,
     const PP_Size& dimensions) {
-  PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
+  PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
   ppp_video_decoder_impl_->ProvidePictureBuffers(
       decoder.instance(), plugin_decoder, req_num_of_bufs, &dimensions);
@@ -140,7 +139,7 @@ void PPP_VideoDecoder_Proxy::OnMsgProvidePictureBuffers(
 
 void PPP_VideoDecoder_Proxy::OnMsgDismissPictureBuffer(
     const HostResource& decoder, int32_t picture_id) {
-  PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
+  PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
   ppp_video_decoder_impl_->DismissPictureBuffer(
       decoder.instance(), plugin_decoder, picture_id);
@@ -148,7 +147,7 @@ void PPP_VideoDecoder_Proxy::OnMsgDismissPictureBuffer(
 
 void PPP_VideoDecoder_Proxy::OnMsgPictureReady(
     const HostResource& decoder, const PP_Picture_Dev& picture) {
-  PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
+  PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
   ppp_video_decoder_impl_->PictureReady(
       decoder.instance(), plugin_decoder, &picture);
@@ -156,7 +155,7 @@ void PPP_VideoDecoder_Proxy::OnMsgPictureReady(
 
 void PPP_VideoDecoder_Proxy::OnMsgNotifyEndOfStream(
     const HostResource& decoder) {
-  PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
+  PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
   ppp_video_decoder_impl_->EndOfStream(decoder.instance(),
                                           plugin_decoder);
@@ -164,7 +163,7 @@ void PPP_VideoDecoder_Proxy::OnMsgNotifyEndOfStream(
 
 void PPP_VideoDecoder_Proxy::OnMsgNotifyError(
     const HostResource& decoder, PP_VideoDecodeError_Dev error) {
-  PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
+  PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
       PluginResourceForHostResource(decoder);
   ppp_video_decoder_impl_->NotifyError(
       decoder.instance(), plugin_decoder, error);