Refactor VideoCaptureManager::GetDeviceFormatsInUse()

content/browser/renderer_host/media/media_devices_dispatcher_host.cc

 // Copyright 2016 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/media_devices_dispatcher_host.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 389 matching lines @@
     }
   }
 
   client_callback.Run(std::move(video_input_capabilities));
 }
 
 media::VideoCaptureFormats MediaDevicesDispatcherHost::GetVideoInputFormats(
     const std::string& device_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   media::VideoCaptureFormats formats;
-  media_stream_manager_->video_capture_manager()->GetDeviceFormatsInUse(
-      MEDIA_DEVICE_VIDEO_CAPTURE, device_id, &formats);
-  if (!formats.empty())
+  base::Optional<media::VideoCaptureFormat> format =
+      media_stream_manager_->video_capture_manager()->GetDeviceFormatInUse(
+          MEDIA_DEVICE_VIDEO_CAPTURE, device_id);
+  if (format.has_value()) {
+    formats.push_back(format.value());
     return formats;
+  }
 
   media_stream_manager_->video_capture_manager()->GetDeviceSupportedFormats(
       device_id, &formats);
   return formats;
 }
 
 }  // namespace content