Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

content/browser/media/media_internals.cc

Index: content/browser/media/media_internals.cc
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc
index 33df1a834fc3b6d18f9947b8372a5f26e900e05b..2f2acc9af1be9480cdcc717652d1562445b23a52 100644
--- a/content/browser/media/media_internals.cc
+++ b/content/browser/media/media_internals.cc
@@ -600,7 +600,7 @@ void MediaInternals::SendVideoCaptureDeviceCapabilities() {
 }
 
 void MediaInternals::UpdateVideoCaptureDeviceCapabilities(
-    const media::VideoCaptureDeviceInfos& video_capture_device_infos) {
+    const VideoCaptureDeviceInfos& video_capture_device_infos) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   video_capture_capabilities_cached_data_.Clear();
 
@@ -615,14 +615,16 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilities(
 
     std::unique_ptr<base::DictionaryValue> device_dict(
         new base::DictionaryValue());
-    device_dict->SetString("id", video_capture_device_info.name.id());
+    device_dict->SetString("id",
+                           video_capture_device_info.descriptor.device_id);
     device_dict->SetString(
-        "name", video_capture_device_info.name.GetNameAndModel());
+        "name", video_capture_device_info.descriptor.GetNameAndModel());
     device_dict->Set("formats", format_list);
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
     defined(OS_ANDROID)
     device_dict->SetString(
-        "captureApi", video_capture_device_info.name.GetCaptureApiTypeString());
+        "captureApi",
+        video_capture_device_info.descriptor.GetCaptureApiTypeString());
 #endif
     video_capture_capabilities_cached_data_.Append(std::move(device_dict));
   }