Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_info.cc

Index: media/capture/video/video_capture_device_info.cc
diff --git a/media/capture/video/video_capture_device_info.cc b/media/capture/video/video_capture_device_info.cc
index 230c16b381ec62477fd94cf94d80b6989bf3d3b1..5c62c9e741b66c9ddff67bef4c3b4824a45e80dd 100644
--- a/media/capture/video/video_capture_device_info.cc
+++ b/media/capture/video/video_capture_device_info.cc
@@ -10,15 +10,16 @@ VideoCaptureDeviceInfo::VideoCaptureDeviceInfo() {
 }
 
 VideoCaptureDeviceInfo::VideoCaptureDeviceInfo(
-    const VideoCaptureDevice::Name& name,
-    const VideoCaptureFormats& supported_formats)
-    : name(name), supported_formats(supported_formats) {
-}
-
-VideoCaptureDeviceInfo::VideoCaptureDeviceInfo(
     const VideoCaptureDeviceInfo& other) = default;
 
 VideoCaptureDeviceInfo::~VideoCaptureDeviceInfo() {
 }
 
+std::string VideoCaptureDeviceInfo::GetNameAndModel() const {
+  if (model_id.empty()) {
+    return descriptor.friendly_name;
+  }

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

No need for {} for one-line bodies (might
not be fully enforced in media/ but it's a
pervasive enough rule that we should follow 
it).

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

Done.

+  return descriptor.friendly_name + " (" + model_id + ")";
+}
+
 }  // namespace media