Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_info.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_INFO_H_
 #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;
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_INFO_H_