ImageCapture: ScopedResultCallback

media/capture/video/video_capture_device.h

Index: media/capture/video/video_capture_device.h
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h
index 56a00772bf28064d3e171f24ab26a1bfd9ab455f..65f4f962cb8398338d0d6f76443838aaadabacf3 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -28,6 +28,8 @@
 #include "media/base/media_export.h"
 #include "media/base/video_capture_types.h"
 #include "media/base/video_frame.h"
+#include "media/capture/video/scoped_callback.h"
+#include "third_party/WebKit/public/platform/modules/imagecapture/image_capture.mojom.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 namespace tracked_objects {
@@ -310,14 +312,10 @@ class MEDIA_EXPORT VideoCaptureDevice {
   virtual void StopAndDeAllocate() = 0;
 
   // Asynchronously takes a photo, possibly reconfiguring the capture objects
-  // and/or interrupting the capture flow. Returns false if taking the picture
-  // could not be scheduled at all, or else runs |photo_callback| (on the thread
-  // where TakePhoto() is run).
-  using TakePhotoCallback =
-      base::Callback<void(const std::string&,
-                          std::unique_ptr<std::vector<uint8_t>>)>;
-  virtual bool TakePhoto(const TakePhotoCallback& photo_callback)
-      WARN_UNUSED_RESULT;
+  // and/or interrupting the capture flow. Runs |callback| on the thread
+  // where TakePhoto() is called, if the photo was successfully taken.
+  using TakePhotoCallback = blink::mojom::ImageCapture::TakePhotoCallback;

[miu, 2016/05/28 01:29:56]

ditto: Is it legal to introduce blink dependencies to src/media interfaces?

[mcasas, 2016/05/31 20:19:05]

For the purpose of this CL, I can (and will) reintroduce 
the previous |using TakePhotoCallback| syntax, so
the dependency to blink is no more, while I talk to
the appropriate people. The problem/question of these
Classes needing Blink type will surface again when
implementing getPhotoCapabilities sincethis one uses a
mojo struct pointer as return type, and it'll be silly to
provide duplicate structures here just to avoid cleaning
up the dependency graph.

Note that I'm still needing to use mojo types here,
but that shouldn't be a problem, i.e. I understood 
that, eventually, mojo would be a pervasive set of 
services, ubiquitous like base::. SG?

[miu, 2016/06/01 00:53:36]

Acknowledged.

+  virtual void TakePhoto(ScopedCallback<TakePhotoCallback> callback);
 
   // Gets the power line frequency, either from the params if specified by the
   // user or from the current system time zone.