Deletes mojo::Callback

media/capture/video/scoped_result_callback.h

Index: media/capture/video/scoped_result_callback.h
diff --git a/media/capture/video/scoped_result_callback.h b/media/capture/video/scoped_result_callback.h
index 59727ed05f4b6293da1bff8febe7b6f9a1cbce42..af4edc1740504fa04b343400a30ee6a8d7deba88 100644
--- a/media/capture/video/scoped_result_callback.h
+++ b/media/capture/video/scoped_result_callback.h
@@ -5,9 +5,9 @@
 #ifndef MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
 #define MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
 
-#include "base/callback_forward.h"
+#include "base/callback.h"
+#include "base/callback_helpers.h"
 #include "base/macros.h"
-#include "mojo/public/cpp/bindings/callback.h"
 
 namespace media {
 
@@ -41,10 +41,7 @@ class ScopedResultCallback {
   template <typename... Args>
   void Run(Args... args) {
     on_error_callback_.Reset();
-    // TODO(mcasas): Use base::ResetAndReturn() when mojo::Callback<> is
-    // compatible with base::Callback<>, see https://crbug.com/596521.
-    callback_.Run(std::forward<Args>(args)...);
-    callback_.Reset();
+    base::ResetAndReturn(&callback_).Run(std::forward<Args>(args)...);
   }
 
  private: