Use the new callback tracker and delete the old one

webkit/plugins/ppapi/host_globals.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 "webkit/plugins/ppapi/host_globals.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 33 matching lines @@
   DCHECK(!host_globals_);
   host_globals_ = this;
 }
 
 HostGlobals::~HostGlobals() {
   DCHECK(host_globals_ == this);
   host_globals_ = NULL;
 }
 
 ::ppapi::ResourceTracker* HostGlobals::GetResourceTracker() {
-  return &host_resource_tracker_;
+  return &resource_tracker_;
 }
 
 ::ppapi::VarTracker* HostGlobals::GetVarTracker() {
   return &host_var_tracker_;
 }
 
 ::ppapi::CallbackTracker* HostGlobals::GetCallbackTrackerForInstance(
     PP_Instance instance) {
   std::map<PP_Instance, linked_ptr<InstanceData> >::iterator found =
       instance_map_.find(instance);
   if (found == instance_map_.end())
     return NULL;
 
-  return found->second->instance->module()->GetNewCallbackTracker();
+  return found->second->instance->module()->GetCallbackTracker();
 }
 
 ::ppapi::FunctionGroupBase* HostGlobals::GetFunctionAPI(PP_Instance pp_instance,
                                                         ::ppapi::ApiID id) {
   // Get the instance object. This also ensures that the instance data is in
   // the map, since we need it below.
   PluginInstance* instance = GetInstance(pp_instance);
   if (!instance)
     return NULL;
 
@@ skipping 87 matching lines @@
   do {
     new_instance = MakeTypedId(static_cast<PP_Instance>(base::RandUint64()),
                                ::ppapi::PP_ID_TYPE_INSTANCE);
   } while (!new_instance ||
            instance_map_.find(new_instance) != instance_map_.end() ||
            !instance->module()->ReserveInstanceID(new_instance));
 
   instance_map_[new_instance] = linked_ptr<InstanceData>(new InstanceData);
   instance_map_[new_instance]->instance = instance;
 
-  host_resource_tracker_.DidCreateInstance(new_instance);
+  resource_tracker_.DidCreateInstance(new_instance);
   return new_instance;
 }
 
 void HostGlobals::InstanceDeleted(PP_Instance instance) {
-  host_resource_tracker_.DidDeleteInstance(instance);
+  resource_tracker_.DidDeleteInstance(instance);
   host_var_tracker_.ForceFreeNPObjectsForInstance(instance);
   instance_map_.erase(instance);
 }
 
 void HostGlobals::InstanceCrashed(PP_Instance instance) {
-  host_resource_tracker_.DidDeleteInstance(instance);
+  resource_tracker_.DidDeleteInstance(instance);
   host_var_tracker_.ForceFreeNPObjectsForInstance(instance);
 }
 
 PluginInstance* HostGlobals::GetInstance(PP_Instance instance) {
   DLOG_IF(ERROR, !CheckIdType(instance, ::ppapi::PP_ID_TYPE_INSTANCE))
       << instance << " is not a PP_Instance.";
   InstanceMap::iterator found = instance_map_.find(instance);
   if (found == instance_map_.end())
     return NULL;
   return found->second->instance;
 }
 
 }  // namespace ppapi
 }  // namespace webkit