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

ppapi/shared_impl/var.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/shared_impl/var.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "ppapi/c/pp_var.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
+#include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/shared_impl/var_tracker.h"
 
 namespace ppapi {
 
 // Var -------------------------------------------------------------------------
 
 Var::Var(PP_Module module) : pp_module_(module), var_id_(0) {
 }
 
 Var::~Var() {
@@ skipping 47 matching lines @@
 
 ProxyObjectVar* Var::AsProxyObjectVar() {
   return NULL;
 }
 
 int32 Var::GetExistingVarID() const {
   return var_id_;
 }
 
 int32 Var::GetOrCreateVarID() {
-  VarTracker* tracker = PpapiGlobals::Get()->GetVarTracker();
+  VarTracker* tracker = TrackerBase::Get()->GetVarTracker();
   if (var_id_) {
     if (!tracker->AddRefVar(var_id_))
       return 0;
   } else {
     var_id_ = tracker->AddVar(this);
     if (!var_id_)
       return 0;
   }
   return var_id_;
 }
@@ skipping 49 matching lines @@
   if (!str || !IsStringUTF8(str->value()))
     return PP_MakeNull();
   return str->GetPPVar();
 }
 
 // static
 StringVar* StringVar::FromPPVar(PP_Var var) {
   if (var.type != PP_VARTYPE_STRING)
     return NULL;
   scoped_refptr<Var> var_object(
-      PpapiGlobals::Get()->GetVarTracker()->GetVar(var));
+      TrackerBase::Get()->GetVarTracker()->GetVar(var));
   if (!var_object)
     return NULL;
   return var_object->AsStringVar();
 }
 
 }  // namespace ppapi