Use the new callback tracker and delete the old one

webkit/plugins/ppapi/plugin_module.h

Index: webkit/plugins/ppapi/plugin_module.h
diff --git a/webkit/plugins/ppapi/plugin_module.h b/webkit/plugins/ppapi/plugin_module.h
index 708c8ace62eec34a37569a12c48ab33bf1a8e45e..c1e1c02435c4d72e7c681947b7a63784306f149e 100644
--- a/webkit/plugins/ppapi/plugin_module.h
+++ b/webkit/plugins/ppapi/plugin_module.h
@@ -35,7 +35,6 @@ class WebKitForwarding;
 namespace webkit {
 namespace ppapi {
 
-class CallbackTracker;
 class PluginDelegate;
 class PluginInstance;
 
@@ -117,8 +116,7 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
   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.
@@ -156,10 +154,6 @@ class WEBKIT_PLUGINS_EXPORT PluginModule :
 
   // 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_;