Refactor VideoCaptureManager::GetDeviceFormatsInUse()

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 0021c1e4036b7325d04d0ced58d68e40f5257612..b28243ac155f0938c9862a71f399e1240c837158 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -149,13 +149,12 @@ class CONTENT_EXPORT VideoCaptureManager
   // 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);
-  // Retrieves the format(s) currently in use.  Returns false if the
-  // |stream_type|, |device_id| pair is not found. Returns true and
-  // |formats_in_use| otherwise. |formats_in_use| is empty if the device is not
-  // in use.
-  bool GetDeviceFormatsInUse(MediaStreamType stream_type,
-                             const std::string& device_id,
-                             media::VideoCaptureFormats* supported_formats);
+  // Retrieves the format currently in use.  Returns base::nullopt if the
+  // |stream_type|, |device_id| pair is not found. Returns in-use format of the
+  // device otherwise.
+  base::Optional<media::VideoCaptureFormat> GetDeviceFormat(

[chfremer, 2017/04/10 17:24:03]

Why did you decide to drop the ...InUse suffix from the method name?

[Chandan, 2017/04/11 07:45:07]

Done.

+      MediaStreamType stream_type,
+      const std::string& device_id);
 
   // Sets the platform-dependent window ID for the desktop capture notification
   // UI for the given session.