Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

content/browser/media/media_internals.cc

 // Copyright (c) 2012 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 "content/browser/media/media_internals.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 582 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (!CanUpdate())
     return;
 
   SendUpdate(SerializeUpdate("media.onReceiveVideoCaptureCapabilities",
                              &video_capture_capabilities_cached_data_));
 }
 
 void MediaInternals::UpdateVideoCaptureDeviceCapabilities(
-    const media::VideoCaptureDeviceInfos& video_capture_device_infos) {
+    const std::vector<std::tuple<media::VideoCaptureDeviceDescriptor,
+                                 media::VideoCaptureFormats>>&
+        descriptors_and_formats) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   video_capture_capabilities_cached_data_.Clear();
 
-  for (const auto& video_capture_device_info : video_capture_device_infos) {
+  for (const auto& device_format_pair : descriptors_and_formats) {
     base::ListValue* format_list = new base::ListValue();
     // TODO(nisse): Representing format information as a string, to be
     // parsed by the javascript handler, is brittle. Consider passing
     // a list of mappings instead.
 
-    for (const auto& format : video_capture_device_info.supported_formats)
+    const media::VideoCaptureDeviceDescriptor& descriptor =
+        std::get<0>(device_format_pair);
+    const media::VideoCaptureFormats& supported_formats =
+        std::get<1>(device_format_pair);
+    for (const auto& format : supported_formats)
       format_list->AppendString(media::VideoCaptureFormat::ToString(format));
 
     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", descriptor.device_id);
+    device_dict->SetString("name", 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());
+    device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString());
 #endif
     video_capture_capabilities_cached_data_.Append(std::move(device_dict));
   }
 
   SendVideoCaptureDeviceCapabilities();
 }
 
 std::unique_ptr<media::AudioLog> MediaInternals::CreateAudioLog(
     AudioComponent component) {
   base::AutoLock auto_lock(lock_);
@@ skipping 65 matching lines @@
           audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict));
       existing_dict->MergeDictionary(value);
     }
   }
 
   if (CanUpdate())
     SendUpdate(SerializeUpdate(function, value));
 }
 
 }  // namespace content