Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_info.h

Index: media/capture/video/video_capture_device_info.h
diff --git a/media/capture/video/video_capture_device_info.h b/media/capture/video/video_capture_device_info.h
index 5f68649b0e2e9a26ce2fdee68963b59d78df951a..87467b6ccb41f943cecfbf2c70990c28a4b6242a 100644
--- a/media/capture/video/video_capture_device_info.h
+++ b/media/capture/video/video_capture_device_info.h
@@ -6,20 +6,24 @@
 #define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_INFO_H_
 
 #include "media/base/video_capture_types.h"
-#include "media/capture/video/video_capture_device.h"
+#include "media/capture/video/video_capture_device_descriptor.h"
 
 namespace media {
 
-// A convenience wrap of a device's name and associated supported formats.
 struct CAPTURE_EXPORT VideoCaptureDeviceInfo {
   VideoCaptureDeviceInfo();
-  VideoCaptureDeviceInfo(const VideoCaptureDevice::Name& name,
-                         const VideoCaptureFormats& supported_formats);
   VideoCaptureDeviceInfo(const VideoCaptureDeviceInfo& other);
   ~VideoCaptureDeviceInfo();
 
-  VideoCaptureDevice::Name name;
+  // Friendly name of a device, plus the model identifier in parentheses.
+  std::string GetNameAndModel() const;
+
+  VideoCaptureDeviceDescriptor descriptor;
   VideoCaptureFormats supported_formats;
+  // A unique hardware identifier of the capture device.
+  // It is of the form "[vid]:[pid]" when a USB device is detected, and empty
+  // otherwise.
+  std::string model_id;
 };
 
 typedef std::vector<VideoCaptureDeviceInfo> VideoCaptureDeviceInfos;