Revert of Deletes mojo::Callback

media/capture/video/scoped_result_callback.h

 // Copyright 2016 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 MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
 #define MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_
 
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/callback_forward.h"
 #include "base/macros.h"
+#include "mojo/public/cpp/bindings/callback.h"
 
 namespace media {
 
 // This class guarantees that |callback_| has either been called or will pass it
 // to |on_error_callback_| on destruction. Inspired by ScopedWebCallbacks<>.
 template <typename CallbackType>
 class ScopedResultCallback {
  public:
   using OnErrorCallback = base::Callback<void(const CallbackType&)>;
   ScopedResultCallback(const CallbackType& callback,
@@ skipping 13 matching lines @@
     callback_ = other.callback_;
     other.callback_.Reset();
     on_error_callback_ = other.on_error_callback_;
     other.on_error_callback_.Reset();
     return *this;
   }
 
   template <typename... Args>
   void Run(Args... args) {
     on_error_callback_.Reset();
-    base::ResetAndReturn(&callback_).Run(std::forward<Args>(args)...);
+    // 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();
   }
 
  private:
   CallbackType callback_;
   OnErrorCallback on_error_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedResultCallback);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_SCOPED_RESULT_CALLBACK_H_