ImageCapture: ScopedResultCallback

media/capture/video/android/video_capture_device_android.h

Index: media/capture/video/android/video_capture_device_android.h
diff --git a/media/capture/video/android/video_capture_device_android.h b/media/capture/video/android/video_capture_device_android.h
index 529acd07d1e2605c1acf2b8a3212c29e207230d4..56e44f4e7e57a2fe5a5e7e0dbffc1f3c4aeced09 100644
--- a/media/capture/video/android/video_capture_device_android.h
+++ b/media/capture/video/android/video_capture_device_android.h
@@ -56,7 +56,7 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
   void AllocateAndStart(const VideoCaptureParams& params,
                         std::unique_ptr<Client> client) override;
   void StopAndDeAllocate() override;
-  bool TakePhoto(const TakePhotoCallback& photo_callback) override;
+  void TakePhoto(ScopedResultCallback<TakePhotoCallback> callback) override;
 
   // Implement org.chromium.media.VideoCapture.nativeOnFrameAvailable.
   void OnFrameAvailable(JNIEnv* env,
@@ -99,7 +99,8 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {
 
   // List of |photo_callbacks_| in flight, being served in Java side.
   base::Lock photo_callbacks_lock_;
-  std::list<std::unique_ptr<TakePhotoCallback>> photo_callbacks_;
+  std::list<std::unique_ptr<ScopedResultCallback<TakePhotoCallback>>>
+      photo_callbacks_;
 
   Name device_name_;
   VideoCaptureFormat capture_format_;