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..ad601c26a7bdc1bae8b2d31d6cb8d3e4553480ec 100644
--- a/content/browser/media/media_internals.cc
+++ b/content/browser/media/media_internals.cc
@@ -615,14 +615,15 @@ 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(
-        "name", video_capture_device_info.name.GetNameAndModel());
+    device_dict->SetString("id",
+                           video_capture_device_info.descriptor.device_id);
+    device_dict->SetString("name", video_capture_device_info.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));
   }