Use the new callback tracker and delete the old one

webkit/plugins/ppapi/ppb_flash_menu_impl.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_PPB_FLASH_MENU_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_FLASH_MENU_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_point.h"
 #include "ppapi/c/private/ppb_flash_menu.h"
+#include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_flash_menu_api.h"
-#include "webkit/plugins/ppapi/callbacks.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 struct WebMenuItem;
 
 namespace webkit {
 namespace ppapi {
 
 class PPB_Flash_Menu_Impl : public ::ppapi::Resource,
                             public ::ppapi::thunk::PPB_Flash_Menu_API {
  public:
@@ skipping 22 matching lines @@
   bool Init(const PP_Flash_Menu* menu_data);
 
   MenuData menu_data_;
 
   // We send |WebMenuItem|s, which have an |unsigned| "action" field instead of
   // an |int32_t| ID. (Chrome also limits the range of valid values for
   // actions.) This maps actions to IDs.
   std::vector<int32_t> menu_id_map_;
 
   // Any pending callback (for |Show()|).
-  scoped_refptr<TrackedCompletionCallback> callback_;
+  scoped_refptr< ::ppapi::TrackedCallback> callback_;
 
   // Output buffers to be filled in when the callback is completed successfully.
   int32_t* selected_id_out_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Flash_Menu_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_FLASH_MENU_IMPL_H_