Refactor VideoCaptureManager::GetDeviceFormatsInUse()

content/browser/renderer_host/media/video_capture_manager.h

 // 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.
 
 // VideoCaptureManager is used to open/close, start/stop, enumerate available
 // video capture devices, and manage VideoCaptureController's.
 // All functions are expected to be called from Browser::IO thread. Some helper
 // functions (*OnDeviceThread) will dispatch operations to the device thread.
 // VideoCaptureManager will open OS dependent instances of VideoCaptureDevice.
 // A device can only be opened once.
@@ skipping 131 matching lines @@
   // during device(s) enumeration, and depending on the underlying
   // implementation, could be an empty list.
   bool GetDeviceSupportedFormats(const std::string& device_id,
                                  media::VideoCaptureFormats* supported_formats);
 
   // 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);
-  // 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> GetDeviceFormatInUse(
+      MediaStreamType stream_type,
+      const std::string& device_id);
 
   // Sets the platform-dependent window ID for the desktop capture notification
   // UI for the given session.
   void SetDesktopCaptureWindowId(media::VideoCaptureSessionId session_id,
                                  gfx::NativeViewId window_id);
 
   void GetPhotoCapabilities(
       int session_id,
       VideoCaptureDevice::GetPhotoCapabilitiesCallback callback);
   void SetPhotoOptions(int session_id,
@@ skipping 137 matching lines @@
   // Map used by DesktopCapture.
   std::map<media::VideoCaptureSessionId, gfx::NativeViewId>
       notification_window_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_MANAGER_H_