Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_info.cc

 // 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.
 
 #include "media/capture/video/video_capture_device_info.h"
 
 namespace media {
 
 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