Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / media / video_capture_manager.h

diff --git a/src/content/browser/renderer_host/media/video_capture_manager.h b/src/content/browser/renderer_host/media/video_capture_manager.h
index 360e1d1..b3537fa 100644 (file)
--- a/src/content/browser/renderer_host/media/video_capture_manager.h
+++ b/src/content/browser/renderer_host/media/video_capture_manager.h
@@ -41,7 +41,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
 
   // Implements MediaStreamProvider.
   virtual void Register(MediaStreamProviderListener* listener,
-                        base::MessageLoopProxy* device_thread_loop) OVERRIDE;
+                        const scoped_refptr<base::SingleThreadTaskRunner>&
+                            device_task_runner) OVERRIDE;
 
   virtual void Unregister() OVERRIDE;
 
@@ -84,17 +85,18 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
                             VideoCaptureControllerEventHandler* client_handler);
 
   // Retrieves all capture supported formats for a particular device. Returns
-  // false if the |capture_session_id| is not found.The supported formats are
+  // false if the |capture_session_id| is not found. The supported formats are
   // cached during device(s) enumeration, and depending on the underlying
   // implementation, could be an empty list.
   bool GetDeviceSupportedFormats(
       media::VideoCaptureSessionId capture_session_id,
       media::VideoCaptureFormats* supported_formats);
 
-  // Retrieves the format currently in use. Returns true on success. If no
-  // format is in use, returns false, and |format_in_use| is untouched.
-  bool GetDeviceFormatInUse(media::VideoCaptureSessionId capture_session_id,
-                            media::VideoCaptureFormat* format_in_use);
+  // Retrieves the format(s) currently in use.  Returns false if the
+  // |capture_session_id| is not found. Returns true and |formats_in_use|
+  // otherwise. |formats_in_use| is empty if the device is not in use.
+  bool GetDeviceFormatsInUse(media::VideoCaptureSessionId capture_session_id,
+                             media::VideoCaptureFormats* formats_in_use);
 
  private:
   virtual ~VideoCaptureManager();
@@ -166,7 +168,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
                                  DeviceInfos& device_vector);
 
   // The message loop of media stream device thread, where VCD's live.
-  scoped_refptr<base::MessageLoopProxy> device_loop_;
+  scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
 
   // Only accessed on Browser::IO thread.
   MediaStreamProviderListener* listener_;