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 {

[mcasas, 2016/07/26 23:52:04]

As a note, I was reading the changes in 
VideoCaptureManager and found confusing the
difference between VCDDescriptor and VCDInfo
(whereas on ToT this is Name and Info, and
Name sounds like less informational than
Info...).

So, I like VCDDescriptor, but Info is a bit
less evident. But really, VCDInfo is just a
convenience for VideoCaptureManager (later
was hijacked by media_internals stuff as well),
so could we just nuke VCDInfo ?

Also, shouldn't |model_id| live in VCDDescriptor?

[chfremer, 2016/07/27 23:10:18]

I agree that the difference between ...Descriptor and ...Info is not clear from
the names. Unfortunately, I don't have any great ideas for better naming here.
What does ToT stand for?

I am assuming that the reason to keep the two separate is that it is supposed to
be "cheap" to query for the descriptors, but it can be expensive to query for
the model_id and supported formats. Because of that, I decided to keep them
separate.

How would you feel about renaming VideoCaptureDeviceInfo to
VideoCaptureDeviceExpensiveInfo? Or VideoCaptureDeviceProperties?

[mcasas, 2016/07/28 00:05:42]

Tip of the Tree, i.e. master standpoint.
Not really: Linux vid:pid implies reading from the /dev/ file, but
that has to happen anyhow, and for Win/Mac, the vid:pid is just
extracted out of the device id. (Android has no vid:pid). I guess 
is just historical, so I'd say just move |model_id| to VCDIngo if 
at all possible, so VCDInfo keeps all the naming information 
together.
With my comment before, could we consider nuking
VideoCaptureDeviceInfo and using a
using std::pair<>or an ad-hoc struct inside VideoCaptureManager
to tie together |name| and |supported_formats| ?

[chfremer, 2016/07/29 18:09:50]

I think you meant to suggest to put |model_id| into VCDDescriptor. Considering
that obtaining the |model_ids| is cheap, I agree that it should go there. I will
post a new PatchSet with that change.
Yes. Will do that.

   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;