Use the new callback tracker and delete the old one

ppapi/shared_impl/tracked_callback.cc

 // Copyright (c) 2010 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 "ppapi/shared_impl/tracked_callback.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 55 matching lines @@
     if (aborted())
       result = PP_ERROR_ABORTED;
 
     // Do this before running the callback in case of reentrancy (which
     // shouldn't happen, but avoid strange failures).
     MarkAsCompleted();
     PP_RunCompletionCallback(&callback, result);
   }
 }
 
+// static
+void TrackedCallback::ClearAndRun(scoped_refptr<TrackedCallback>* callback,
+                                  int32_t result) {
+  scoped_refptr<TrackedCallback> temp;
+  temp.swap(*callback);
+  temp->Run(result);
+}
+
+// static
+void TrackedCallback::ClearAndAbort(scoped_refptr<TrackedCallback>* callback) {
+  scoped_refptr<TrackedCallback> temp;
+  temp.swap(*callback);
+  temp->Abort();
+}
+
 void TrackedCallback::MarkAsCompleted() {
   DCHECK(!completed());
 
   // We will be removed; maintain a reference to ensure we won't be deleted
   // until we're done.
   scoped_refptr<TrackedCallback> thiz = this;
   completed_ = true;
   tracker_->Remove(thiz);
   tracker_ = NULL;
 }
 
 }  // namespace ppapi