Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/fake_video_capture_device_factory.cc

Index: media/capture/video/fake_video_capture_device_factory.cc
diff --git a/media/capture/video/fake_video_capture_device_factory.cc b/media/capture/video/fake_video_capture_device_factory.cc
index 32f62fc866f6531566a5de5ec7f8b984705bc011..269e04f182644f8aa74f55097bda6c2fc66c6054 100644
--- a/media/capture/video/fake_video_capture_device_factory.cc
+++ b/media/capture/video/fake_video_capture_device_factory.cc
@@ -27,14 +27,14 @@ FakeVideoCaptureDeviceFactory::FakeVideoCaptureDeviceFactory()
       frame_rate_(kFakeCaptureDefaultFrameRate) {}
 
 std::unique_ptr<VideoCaptureDevice> FakeVideoCaptureDeviceFactory::Create(
-    const VideoCaptureDevice::Name& device_name) {
+    const VideoCaptureDeviceDescriptor& device_descriptor) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   parse_command_line();
 
   for (int n = 0; n < number_of_devices_; ++n) {
     std::string possible_id = base::StringPrintf("/dev/video%d", n);
-    if (device_name.id().compare(possible_id) == 0) {
+    if (device_descriptor.device_id.compare(possible_id) == 0) {
       return std::unique_ptr<VideoCaptureDevice>(
           new FakeVideoCaptureDevice(fake_vcd_ownership_, frame_rate_));
     }
@@ -42,33 +42,38 @@ std::unique_ptr<VideoCaptureDevice> FakeVideoCaptureDeviceFactory::Create(
   return std::unique_ptr<VideoCaptureDevice>();
 }
 
-void FakeVideoCaptureDeviceFactory::GetDeviceNames(
-    VideoCaptureDevice::Names* const device_names) {
+void FakeVideoCaptureDeviceFactory::GetDeviceDescriptors(
+    VideoCaptureDeviceDescriptors* device_descriptors) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(device_names->empty());
+  DCHECK(device_descriptors->empty());
   for (int n = 0; n < number_of_devices_; ++n) {
-    VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
-                                  base::StringPrintf("/dev/video%d", n)
+    VideoCaptureDeviceDescriptor descriptor;
+    descriptor.device_id = base::StringPrintf("/dev/video%d", n);
+    descriptor.friendly_name = base::StringPrintf("fake_device_%d", n);
 #if defined(OS_LINUX)
-                                      ,
-                                  VideoCaptureDevice::Name::V4L2_SINGLE_PLANE
+    descriptor.capture_api = VideoCaptureApiType::LINUX_V4L2_SINGLE_PLANE;
 #elif defined(OS_MACOSX)
-                                      ,
-                                  VideoCaptureDevice::Name::AVFOUNDATION
+    descriptor.capture_api = VideoCaptureApiType::MACOSX_AVFOUNDATION;
 #elif defined(OS_WIN)
-                                      ,
-                                  VideoCaptureDevice::Name::DIRECT_SHOW
+    descriptor.capture_api = VideoCaptureApiType::WINDOWS_DIRECT_SHOW;
 #elif defined(OS_ANDROID)
-                                      ,
-                                  VideoCaptureDevice::Name::API2_LEGACY
+    descriptor.capture_api = VideoCaptureApiType::ANDROID_API2_LEGACY;
 #endif
-                                  );
-    device_names->push_back(name);
+    device_descriptors->push_back(descriptor);
   }
 }
 
+void FakeVideoCaptureDeviceFactory::GetDeviceInfo(
+    const VideoCaptureDeviceDescriptor& device_descriptor,
+    VideoCaptureDeviceInfo* device_info) {
+  DCHECK(device_info);
+  device_info->descriptor = device_descriptor;
+  GetDeviceSupportedFormats(device_descriptor,
+                            &(device_info->supported_formats));
+}
+
 void FakeVideoCaptureDeviceFactory::GetDeviceSupportedFormats(
-    const VideoCaptureDevice::Name& device,
+    const VideoCaptureDeviceDescriptor& device_descriptor,
     VideoCaptureFormats* supported_formats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const gfx::Size supported_sizes[] = {gfx::Size(320, 240),