Revert 117399 - Make it possible to have 1 PpapiGlobals per thread. Update unit tests.

ppapi/shared_impl/var_tracker.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_tracker.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "ppapi/shared_impl/id_assignment.h"
 #include "ppapi/shared_impl/var.h"
@@ skipping 110 matching lines @@
   live_vars_.insert(std::make_pair(new_id,
       VarInfo(var, mode == ADD_VAR_TAKE_ONE_REFERENCE ? 1 : 0)));
 
   return new_id;
 }
 
 VarTracker::VarMap::iterator VarTracker::GetLiveVar(int32 id) {
   return live_vars_.find(id);
 }
 
-int VarTracker::GetRefCountForObject(const PP_Var& plugin_object) {
-  VarMap::iterator found = GetLiveVar(plugin_object);
-  if (found == live_vars_.end())
-    return -1;
-  return found->second.ref_count;
-}
-
-int VarTracker::GetTrackedWithNoReferenceCountForObject(
-    const PP_Var& plugin_object) {
-  VarMap::iterator found = GetLiveVar(plugin_object);
-  if (found == live_vars_.end())
-    return -1;
-  return found->second.track_with_no_reference_count;
-}
-
 VarTracker::VarMap::iterator VarTracker::GetLiveVar(const PP_Var& var) {
   return live_vars_.find(static_cast<int32>(var.value.as_id));
 }
 
 VarTracker::VarMap::const_iterator VarTracker::GetLiveVar(
     const PP_Var& var) const {
   return live_vars_.find(static_cast<int32>(var.value.as_id));
 }
 
 bool VarTracker::IsVarTypeRefcounted(PP_VarType type) const {
@@ skipping 30 matching lines @@
 bool VarTracker::DeleteObjectInfoIfNecessary(VarMap::iterator iter) {
   if (iter->second.ref_count != 0 ||
       iter->second.track_with_no_reference_count != 0)
     return false;  // Object still alive.
   iter->second.var->ResetVarID();
   live_vars_.erase(iter);
   return true;
 }
 
 }  // namespace ppapi