Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/file_video_capture_device_factory.cc

Index: media/capture/video/file_video_capture_device_factory.cc
diff --git a/media/capture/video/file_video_capture_device_factory.cc b/media/capture/video/file_video_capture_device_factory.cc
index 71fad974456197e7bd0bd7095c25c49a1e11c280..f2618bf9241d5155e4534b3ab14bf17014be7c71 100644
--- a/media/capture/video/file_video_capture_device_factory.cc
+++ b/media/capture/video/file_video_capture_device_factory.cc
@@ -26,42 +26,52 @@ base::FilePath GetFilePathFromCommandLine() {
 }
 
 std::unique_ptr<VideoCaptureDevice> FileVideoCaptureDeviceFactory::Create(
-    const VideoCaptureDevice::Name& device_name) {
+    const VideoCaptureDeviceDescriptor& device_descriptor) {
   DCHECK(thread_checker_.CalledOnValidThread());
 #if defined(OS_WIN)
   return std::unique_ptr<VideoCaptureDevice>(new FileVideoCaptureDevice(
-      base::FilePath(base::SysUTF8ToWide(device_name.name()))));
+      base::FilePath(base::SysUTF8ToWide(device_descriptor.friendly_name))));
 #else
-  return std::unique_ptr<VideoCaptureDevice>(
-      new FileVideoCaptureDevice(base::FilePath(device_name.name())));
+  return std::unique_ptr<VideoCaptureDevice>(new FileVideoCaptureDevice(
+      base::FilePath(device_descriptor.friendly_name)));
 #endif
 }
 
-void FileVideoCaptureDeviceFactory::GetDeviceNames(
-    VideoCaptureDevice::Names* const device_names) {
+void FileVideoCaptureDeviceFactory::GetDeviceDescriptors(
+    VideoCaptureDeviceDescriptors* device_descriptors) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(device_names->empty());
+  DCHECK(device_descriptors->empty());
   const base::FilePath command_line_file_path = GetFilePathFromCommandLine();
+  VideoCaptureDeviceDescriptor descriptor;
+  descriptor.device_id = kFileVideoCaptureDeviceName;
 #if defined(OS_WIN)
-  device_names->push_back(VideoCaptureDevice::Name(
-      base::SysWideToUTF8(command_line_file_path.value()),
-      kFileVideoCaptureDeviceName, VideoCaptureDevice::Name::DIRECT_SHOW));
+  descriptor.friendly_name =
+      base::SysWideToUTF8(command_line_file_path.value());
+  descriptor.capture_api = VideoCaptureApiType::WINDOWS_DIRECT_SHOW;
 #elif defined(OS_MACOSX)
-  device_names->push_back(VideoCaptureDevice::Name(
-      command_line_file_path.value(), kFileVideoCaptureDeviceName,
-      VideoCaptureDevice::Name::AVFOUNDATION));
+  descriptor.friendly_name = command_line_file_path.value();
+  descriptor.capture_api = VideoCaptureApiType::MACOSX_AVFOUNDATION;
 #elif defined(OS_LINUX)
-  device_names->push_back(VideoCaptureDevice::Name(
-      command_line_file_path.value(), kFileVideoCaptureDeviceName,
-      VideoCaptureDevice::Name::V4L2_SINGLE_PLANE));
+  descriptor.friendly_name = command_line_file_path.value();
+  descriptor.capture_api = VideoCaptureApiType::LINUX_V4L2_SINGLE_PLANE;
 #else
-  device_names->push_back(VideoCaptureDevice::Name(
-      command_line_file_path.value(), kFileVideoCaptureDeviceName));
+  descriptor.friendly_name = command_line_file_path.value();
+  descriptor.capture_api = VideoCaptureApiType::API_TYPE_UNKNOWN;
 #endif
+  device_descriptors->push_back(descriptor);
+}
+
+void FileVideoCaptureDeviceFactory::GetDeviceInfo(
+    const VideoCaptureDeviceDescriptor& device_descriptor,
+    VideoCaptureDeviceInfo* device_info) {
+  DCHECK(device_info);
+  device_info->descriptor = device_descriptor;
+  GetDeviceSupportedFormats(device_descriptor,
+                            &(device_info->supported_formats));
 }
 
 void FileVideoCaptureDeviceFactory::GetDeviceSupportedFormats(
-    const VideoCaptureDevice::Name& device,
+    const VideoCaptureDeviceDescriptor& device_descriptor,
     VideoCaptureFormats* supported_formats) {
   DCHECK(thread_checker_.CalledOnValidThread());