Use the new callback tracker and delete the old one

webkit/plugins/ppapi/ppb_file_chooser_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_file_chooser_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/shared_impl/var.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserCompletion.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/ppapi/callbacks.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.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::StringVar;
 using ppapi::thunk::PPB_FileChooser_API;
+using ppapi::TrackedCallback;
 using WebKit::WebCString;
 using WebKit::WebFileChooserCompletion;
 using WebKit::WebFileChooserParams;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
@@ skipping 73 matching lines @@
 
   RunCallback((chosen_files_.size() > 0) ? PP_OK : PP_ERROR_USERCANCEL);
 }
 
 int32_t PPB_FileChooser_Impl::ValidateCallback(
     const PP_CompletionCallback& callback) {
   // We only support non-blocking calls.
   if (!callback.func)
     return PP_ERROR_BLOCKS_MAIN_THREAD;
 
-  if (callback_.get() && !callback_->completed())
+  if (TrackedCallback::IsPending(callback_))
     return PP_ERROR_INPROGRESS;
 
   return PP_OK;
 }
 
 void PPB_FileChooser_Impl::RegisterCallback(
     const PP_CompletionCallback& callback) {
   DCHECK(callback.func);
-  DCHECK(!callback_.get() || callback_->completed());
+  DCHECK(!TrackedCallback::IsPending(callback_));
 
   PluginModule* plugin_module = ResourceHelper::GetPluginModule(this);
   if (!plugin_module)
     return;
 
-  callback_ = new TrackedCompletionCallback(plugin_module->GetCallbackTracker(),
-                                            pp_resource(), callback);
+  callback_ = new TrackedCallback(this, callback);
 }
 
 void PPB_FileChooser_Impl::RunCallback(int32_t result) {
-  scoped_refptr<TrackedCompletionCallback> callback;
-  callback.swap(callback_);
-  callback->Run(result);  // Will complete abortively if necessary.
+  TrackedCallback::ClearAndRun(&callback_, result);
 }
 
 int32_t PPB_FileChooser_Impl::Show(const PP_CompletionCallback& callback) {
   return ShowWithoutUserGesture(false, NULL, callback);
 }
 
 int32_t PPB_FileChooser_Impl::ShowWithoutUserGesture(
     bool save_as,
     const char* suggested_file_name,
     const PP_CompletionCallback& callback) {
@@ skipping 51 matching lines @@
       continue;
     StringToLowerASCII(&mime_type);
     normalized_mime_type_list.push_back(WebString::fromUTF8(mime_type.data(),
                                                             mime_type.size()));
   }
   return normalized_mime_type_list;
 }
 
 }  // namespace ppapi
 }  // namespace webkit