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

ppapi/proxy/ppp_instance_proxy.cc

 // 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/ppp_instance_proxy.h"
 
 #include <algorithm>
 
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/private/ppb_flash_fullscreen.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/ppb_url_loader_proxy.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 PP_Bool DidCreate(PP_Instance instance,
                   uint32_t argc,
                   const char* argn[],
                   const char* argv[]) {
@@ skipping 140 matching lines @@
   *result = PP_FALSE;
   if (argn.size() != argv.size())
     return;
 
   // Set up the routing associating this new instance with the dispatcher we
   // just got the message from. This must be done before calling into the
   // plugin so it can in turn call PPAPI functions.
   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.
   std::vector<const char*> argn_array(
       std::max(static_cast<size_t>(1), argn.size()));
   std::vector<const char*> argv_array(
       std::max(static_cast<size_t>(1), argn.size()));
   for (size_t i = 0; i < argn.size(); i++) {
     argn_array[i] = argn[i].c_str();
     argv_array[i] = argv[i].c_str();
   }
 
   DCHECK(combined_interface_.get());
   *result = combined_interface_->DidCreate(instance,
                                            static_cast<uint32_t>(argn.size()),
                                            &argn_array[0], &argv_array[0]);
 }
 
 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);
 }
 
 void PPP_Instance_Proxy::OnMsgDidChangeView(PP_Instance instance,
                                             const PP_Rect& position,
                                             const PP_Rect& clip,
                                             PP_Bool fullscreen,
                                             PP_Bool flash_fullscreen) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
@@ skipping 18 matching lines @@
   PP_Resource plugin_loader =
       PPB_URLLoader_Proxy::TrackPluginResource(url_loader);
   *result = combined_interface_->HandleDocumentLoad(instance, plugin_loader);
 
   // This balances the one reference that TrackPluginResource() initialized it
   // with. The plugin will normally take an additional reference which will keep
   // the resource alive in the plugin (and the one reference in the renderer
   // 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
 }  // namespace ppapi