Use the new callback tracker and delete the old one

webkit/plugins/ppapi/plugin_module.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/plugin_module.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 74 matching lines @@
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "ppapi/shared_impl/ppb_opengles2_shared.h"
 #include "ppapi/shared_impl/ppb_var_shared.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/plugin_switches.h"
-#include "webkit/plugins/ppapi/callbacks.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/host_globals.h"
-#include "webkit/plugins/ppapi/host_resource_tracker.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h"
@@ skipping 104 matching lines @@
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void QuitMessageLoop(PP_Instance instance) {
   MessageLoop::current()->QuitNow();
 }
 
 uint32_t GetLiveObjectsForInstance(PP_Instance instance_id) {
-  return HostGlobals::Get()->host_resource_tracker()->GetLiveObjectsForInstance(
+  return HostGlobals::Get()->GetResourceTracker()->GetLiveObjectsForInstance(
       instance_id);
 }
 
 PP_Bool IsOutOfProcess() {
   return PP_FALSE;
 }
 
 void SimulateInputEvent(PP_Instance instance, PP_Resource input_event) {
   PluginInstance* plugin_instance = host_globals->GetInstance(instance);
   if (!plugin_instance)
@@ skipping 175 matching lines @@
       initialize_module(NULL),
       shutdown_module(NULL) {
 }
 
 // PluginModule ----------------------------------------------------------------
 
 PluginModule::PluginModule(const std::string& name,
                            const FilePath& path,
                            PluginDelegate::ModuleLifetime* lifetime_delegate)
     : lifetime_delegate_(lifetime_delegate),
-      old_callback_tracker_(new CallbackTracker),
       callback_tracker_(new ::ppapi::CallbackTracker),
       is_in_destructor_(false),
       is_crashed_(false),
       broker_(NULL),
       library_(NULL),
       name_(name),
       path_(path),
       reserve_instance_id_(NULL) {
   // Ensure the globals object is created.
   if (!host_globals)
@@ skipping 10 matching lines @@
   // destructor. Catch if that happens again earlier.
   CHECK(!is_in_destructor_);
   is_in_destructor_ = true;
 
   // When the module is being deleted, there should be no more instances still
   // holding a reference to us.
   DCHECK(instances_.empty());
 
   GetLivePluginSet()->erase(this);
 
-  old_callback_tracker_->AbortAll();
   callback_tracker_->AbortAll();
 
   if (entry_points_.shutdown_module)
     entry_points_.shutdown_module();
 
   if (library_)
     base::UnloadNativeLibrary(library_);
 
   // Notifications that we've been deleted should be last.
   HostGlobals::Get()->ModuleDeleted(pp_module_);
@@ skipping 84 matching lines @@
 void PluginModule::InstanceCreated(PluginInstance* instance) {
   instances_.insert(instance);
 }
 
 void PluginModule::InstanceDeleted(PluginInstance* instance) {
   if (out_of_process_proxy_.get())
     out_of_process_proxy_->RemoveInstance(instance->pp_instance());
   instances_.erase(instance);
 }
 
-scoped_refptr<CallbackTracker> PluginModule::GetCallbackTracker() {
-  return old_callback_tracker_;
-}
-
-scoped_refptr< ::ppapi::CallbackTracker> PluginModule::GetNewCallbackTracker() {
+scoped_refptr< ::ppapi::CallbackTracker> PluginModule::GetCallbackTracker() {
   return callback_tracker_;
 }
 
 void PluginModule::PluginCrashed() {
   DCHECK(!is_crashed_);  // Should only get one notification.
   is_crashed_ = true;
 
   // Notify all instances that they crashed.
   for (PluginInstanceSet::iterator i = instances_.begin();
        i != instances_.end(); ++i)
@@ skipping 35 matching lines @@
   int retval = entry_points.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit