Use the new callback tracker and delete the old one

webkit/plugins/ppapi/plugin_module.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
 #define WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 17 matching lines @@
 typedef void* NPIdentifier;
 
 namespace ppapi {
 class CallbackTracker;
 class WebKitForwarding;
 }  // namespace ppapi
 
 namespace webkit {
 namespace ppapi {
 
-class CallbackTracker;
 class PluginDelegate;
 class PluginInstance;
 
 // Represents one plugin library loaded into one renderer. This library may
 // have multiple instances.
 //
 // Note: to get from a PP_Instance to a PluginInstance*, use the
 // ResourceTracker.
 class WEBKIT_PLUGINS_EXPORT PluginModule :
     public base::RefCounted<PluginModule>,
@@ skipping 61 matching lines @@
   // Calls the plugin's GetInterface and returns the given interface pointer,
   // which could be NULL.
   const void* GetPluginInterface(const char* name) const;
 
   // This module is associated with a set of instances. The PluginInstance
   // object declares its association with this module in its destructor and
   // releases us in its destructor.
   void InstanceCreated(PluginInstance* instance);
   void InstanceDeleted(PluginInstance* instance);
 
-  scoped_refptr<CallbackTracker> GetCallbackTracker();
-  scoped_refptr< ::ppapi::CallbackTracker> GetNewCallbackTracker();
+  scoped_refptr< ::ppapi::CallbackTracker> GetCallbackTracker();
 
   // Called when running out of process and the plugin crashed. This will
   // release relevant resources and update all affected instances.
   void PluginCrashed();
 
   bool is_in_destructor() const { return is_in_destructor_; }
   bool is_crashed() const { return is_crashed_; }
 
   // Reserves the given instance is unique within the plugin, checking for
   // collisions. See PPB_Proxy_Private for more information.
@@ skipping 17 matching lines @@
  private:
   // Calls the InitializeModule entrypoint. The entrypoint must have been
   // set and the plugin must not be out of process (we don't maintain
   // entrypoints in that case).
   bool InitializeModule(const EntryPoints& entry_points);
 
   PluginDelegate::ModuleLifetime* lifetime_delegate_;
 
   // Tracker for completion callbacks, used mainly to ensure that all callbacks
   // are properly aborted on module shutdown.
-  //
-  // TODO(brettw) remove this in favor of the ::ppapi:: one below.
-  scoped_refptr<CallbackTracker> old_callback_tracker_;
-
   scoped_refptr< ::ppapi::CallbackTracker> callback_tracker_;
 
   PP_Module pp_module_;
 
   // True when we're running in the destructor. This allows us to write some
   // assertions.
   bool is_in_destructor_;
 
   // True if the plugin is running out-of-process and has crashed.
   bool is_crashed_;
@@ skipping 32 matching lines @@
   // Lazily created by GetWebKitForwarding.
   scoped_ptr< ::ppapi::WebKitForwarding> webkit_forwarding_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginModule);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_MODULE_H_