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 8cff6921be506a1113abcee5b51b711e8866b4b1..80e12ba9a0533fb29d915ce320852eab5c546f80 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -159,9 +159,9 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
     return device_task_runner_;
   }
 
-  bool TakePhoto(int session_id,
-                 const VideoCaptureDevice::TakePhotoCallback& photo_callback)
-      WARN_UNUSED_RESULT;
+  void TakePhoto(int session_id,
+                 media::ScopedResultCallback<
+                     VideoCaptureDevice::TakePhotoCallback> callback);
 
  private:
   class DeviceEntry;
@@ -245,10 +245,6 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   // Stops and destroys the VideoCaptureDevice held in |device|.
   void DoStopDeviceOnDeviceThread(std::unique_ptr<VideoCaptureDevice> device);
 
-  void DoTakePhotoOnDeviceThread(
-      media::VideoCaptureDevice* device,
-      const VideoCaptureDevice::TakePhotoCallback& photo_callback);
-
   media::VideoCaptureDeviceInfo* FindDeviceInfoById(
       const std::string& id,
       media::VideoCaptureDeviceInfos& device_vector);