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

ppapi/proxy/plugin_var_serialization_rules.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/plugin_var_serialization_rules.h"
 
 #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() {
 }
 
 PP_Var PluginVarSerializationRules::SendCallerOwned(const PP_Var& var,
                                                     std::string* str_val) {
   // Objects need special translations to get the IDs valid in the host.
   if (var.type == PP_VARTYPE_OBJECT)
     return var_tracker_->GetHostObject(var);
@@ skipping 108 matching lines @@
         static_cast<PluginDispatcher*>(dispatcher), var);
   }
 }
 
 void PluginVarSerializationRules::ReleaseObjectRef(const PP_Var& var) {
   var_tracker_->ReleaseVar(var);
 }
 
 }  // namespace proxy
 }  // namespace ppapi