Replace AudioManager::GetAudio*DeviceNames with AudioManager::GetAudio*DeviceDescriptions

content/browser/renderer_host/media/media_devices_manager.cc

 // Copyright 2016 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/renderer_host/media/media_devices_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 37 matching lines @@
     output_string += "  " + device_info.label + "\n";
   return output_string;
 }
 
 MediaDeviceInfoArray EnumerateAudioDevicesOnDeviceThread(
     media::AudioManager* audio_manager,
     bool is_input) {
   DCHECK(audio_manager->GetTaskRunner()->BelongsToCurrentThread());
 
   MediaDeviceInfoArray snapshot;
-  media::AudioDeviceNames device_names;
+  media::AudioDeviceDescriptions device_descriptions;
   if (is_input)
-    audio_manager->GetAudioInputDeviceNames(&device_names);
+    audio_manager->GetAudioInputDeviceDescriptions(&device_descriptions);
   else
-    audio_manager->GetAudioOutputDeviceNames(&device_names);
+    audio_manager->GetAudioOutputDeviceDescriptions(&device_descriptions);
 
-  for (const media::AudioDeviceName& name : device_names) {
-    snapshot.emplace_back(
-        name.unique_id, name.device_name,
-        is_input ? audio_manager->GetGroupIDInput(name.unique_id)
-                 : audio_manager->GetGroupIDOutput(name.unique_id));
-  }
+  for (const media::AudioDeviceDescription& description : device_descriptions)

[DaleCurtis, 2016/12/12 22:13:44]

Does snapshot.insert(snapshot.end(), device_descriptions.begin(),
device_descriptions.end()) work?

[o1ka, 2016/12/13 09:33:58]

No, unless we have a conversion from AudioDeviceDescription to MediaDeviceInfo.

[DaleCurtis, 2016/12/13 20:16:48]

I was hoping the insert() operator would be smart enough to figure out the
conversion; but we probably have explicit on the constructor which prevents
this.

+    snapshot.emplace_back(description);
 
   return snapshot;
 }
 
 MediaDeviceInfoArray GetFakeAudioDevices(bool is_input) {
   MediaDeviceInfoArray result;
   if (is_input) {
     result.emplace_back(media::AudioDeviceDescription::kDefaultDeviceId,
                         "Fake Default Audio Input",
                         "fake_group_audio_input_default");
@@ skipping 444 matching lines @@
     const MediaDeviceInfoArray& snapshot) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(IsValidMediaDeviceType(type));
 
   for (const auto& subscriber : device_change_subscribers_[type]) {
     subscriber->OnDevicesChanged(type, snapshot);
   }
 }
 
 }  // namespace content