ImageCapture: ScopedResultCallback

content/browser/renderer_host/media/video_capture_manager.h

Index: content/browser/renderer_host/media/video_capture_manager.h
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index e392e72a616d2881d89d768e7089de6b9fda220f..3e5fe1c4291e6d5e48030d08116debca5459f80d 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -157,9 +157,9 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
     return device_task_runner_;
   }
 
-  bool TakePhoto(int session_id,
-                 const media::VideoCaptureDevice::TakePhotoCallback&
-                     photo_callback) WARN_UNUSED_RESULT;
+  void TakePhoto(int session_id,
+                 media::ScopedCallback<
+                     media::VideoCaptureDevice::TakePhotoCallback> callback);
 
  private:
   class DeviceEntry;
@@ -245,10 +245,6 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   void DoStopDeviceOnDeviceThread(
       std::unique_ptr<media::VideoCaptureDevice> device);
 
-  void DoTakePhotoOnDeviceThread(
-      media::VideoCaptureDevice* device,
-      const media::VideoCaptureDevice::TakePhotoCallback& photo_callback);
-
   media::VideoCaptureDeviceInfo* FindDeviceInfoById(
       const std::string& id,
       media::VideoCaptureDeviceInfos& device_vector);