ImageCapture: ScopedResultCallback

content/browser/renderer_host/media/video_capture_manager.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 822 matching lines @@
   device_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VideoCaptureManager::SetDesktopCaptureWindowIdOnDeviceThread,
                  this,
                  existing_device->video_capture_device(),
                  window_id_it->second));
 
   notification_window_ids_.erase(window_id_it);
 }
 
-bool VideoCaptureManager::TakePhoto(
+void VideoCaptureManager::TakePhoto(
     int session_id,
-    const VideoCaptureDevice::TakePhotoCallback& photo_callback) {
+    media::ScopedResultCallback<VideoCaptureDevice::TakePhotoCallback>
+        callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   SessionMap::const_iterator session_it = sessions_.find(session_id);
   if (session_it == sessions_.end())
-    return false;
+    return;
 
   DeviceEntry* const device_info =
       GetDeviceEntryForMediaStreamDevice(session_it->second);
   if (!device_info)
-    return false;
+    return;
   device_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&VideoCaptureManager::DoTakePhotoOnDeviceThread, this,
-                 device_info->video_capture_device(), photo_callback));
-  return true;
-}
-
-void VideoCaptureManager::DoTakePhotoOnDeviceThread(
-    media::VideoCaptureDevice* device,
-    const VideoCaptureDevice::TakePhotoCallback& photo_callback) {
-  DCHECK(IsOnDeviceThread());
-  if (device->TakePhoto(photo_callback))
-    return;
-
-  // TakePhoto() failed synchronously: Make sure |photo_callback| is Run().
-  std::unique_ptr<std::vector<uint8_t>> empty_vector(
-      new std::vector<uint8_t>());
-  photo_callback.Run("", std::move(empty_vector));
+      base::Bind(&VideoCaptureDevice::TakePhoto,
+                 base::Unretained(device_info->video_capture_device()),
+                 base::Passed(&callback)));
 }
 
 void VideoCaptureManager::DoStopDeviceOnDeviceThread(
     std::unique_ptr<VideoCaptureDevice> device) {
   SCOPED_UMA_HISTOGRAM_TIMER("Media.VideoCaptureManager.StopDeviceTime");
   DCHECK(IsOnDeviceThread());
   device->StopAndDeAllocate();
   DVLOG(3) << "DoStopDeviceOnDeviceThread";
 }
 
@@ skipping 244 matching lines @@
       continue;
 
     // Session ID is only valid for Screen capture. So we can fake it to resume
     // video capture devices here.
     QueueStartDevice(kFakeSessionId, entry, entry->parameters);
   }
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content