Use the new callback tracker and delete the old one

webkit/plugins/ppapi/ppb_flash_menu_impl.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/ppb_flash_menu_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webmenuitem.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
-using ::ppapi::thunk::PPB_Flash_Menu_API;
+using ppapi::thunk::PPB_Flash_Menu_API;
+using ppapi::TrackedCallback;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
 // allowed, but not sub-submenus).
 const size_t kMaxMenuDepth = 2;
 
@@ skipping 114 matching lines @@
     return PP_ERROR_INPROGRESS;
 
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return false;
 
   int32_t rv = plugin_instance->delegate()->ShowContextMenu(
       plugin_instance, this, gfx::Point(location->x, location->y));
   if (rv == PP_OK_COMPLETIONPENDING) {
     // Record callback and output buffers.
-    callback_ = new TrackedCompletionCallback(
-        plugin_instance->module()->GetCallbackTracker(),
-        pp_resource(), callback);
+    callback_ = new TrackedCallback(this, callback);
     selected_id_out_ = selected_id_out;
   } else {
     // This should never be completed synchronously successfully.
     DCHECK_NE(rv, PP_OK);
   }
   return rv;
 
   NOTIMPLEMENTED();
   return PP_ERROR_FAILED;
 }
@@ skipping 10 matching lines @@
       // We reserved action 0 to be invalid.
       if (action == 0 || action >= menu_id_map_.size()) {
         NOTREACHED() << "Invalid action received.";
         rv = PP_ERROR_FAILED;
       } else {
         *selected_id_out_ = menu_id_map_[action];
       }
     }
   }
 
-  scoped_refptr<TrackedCompletionCallback> callback;
-  callback.swap(callback_);
   selected_id_out_ = NULL;
-
-  callback->Run(rv);  // Will complete abortively if necessary.
+  TrackedCallback::ClearAndRun(&callback_, rv);
 }
 
 }  // namespace ppapi
 }  // namespace webkit