Reland of Add groupid for media devices. Group audio devices.

content/browser/renderer_host/media/audio_output_device_enumerator.cc

Index: content/browser/renderer_host/media/audio_output_device_enumerator.cc
diff --git a/content/browser/renderer_host/media/audio_output_device_enumerator.cc b/content/browser/renderer_host/media/audio_output_device_enumerator.cc
index 5920eb5a1134b0e85f2f9a83ea92c0e1ebdc2909..46104831f427ce0c17f18b49986ea2d880600979 100644
--- a/content/browser/renderer_host/media/audio_output_device_enumerator.cc
+++ b/content/browser/renderer_host/media/audio_output_device_enumerator.cc
@@ -31,6 +31,8 @@ AudioOutputDeviceEnumeration EnumerateDevicesOnDeviceThread(
     snapshot.devices.push_back(
         {media::AudioDeviceDescription::kDefaultDeviceId,
          media::AudioDeviceDescription::GetDefaultDeviceName(),
+         audio_manager->GetGroupIDOutput(
+             media::AudioDeviceDescription::kDefaultDeviceId),
          audio_manager->GetDefaultOutputStreamParameters()});
     return snapshot;
   }
@@ -38,6 +40,7 @@ AudioOutputDeviceEnumeration EnumerateDevicesOnDeviceThread(
   for (const media::AudioDeviceName& name : device_names) {
     snapshot.devices.push_back(
         {name.unique_id, name.device_name,
+         audio_manager->GetGroupIDOutput(name.unique_id),
          name.unique_id == media::AudioDeviceDescription::kDefaultDeviceId
              ? audio_manager->GetDefaultOutputStreamParameters()
              : audio_manager->GetOutputStreamParameters(name.unique_id)});
@@ -47,6 +50,29 @@ AudioOutputDeviceEnumeration EnumerateDevicesOnDeviceThread(
 
 }  // namespace
 
+AudioOutputDeviceInfo::AudioOutputDeviceInfo() {}

[Max Morin, 2016/09/05 11:10:43]

This stuff had to be added because AudioOutputDeviceInfo became too complex for
default constructor et c.

+
+AudioOutputDeviceInfo::~AudioOutputDeviceInfo() {}
+
+AudioOutputDeviceInfo::AudioOutputDeviceInfo(
+    std::string unique_id,
+    std::string device_name,
+    std::string group_id,
+    media::AudioParameters output_params)
+    : unique_id(unique_id),
+      device_name(device_name),
+      group_id(group_id),

[tommi (sloooow) - chröme, 2016/09/05 13:09:23]

can group_id be const?

[Max Morin, 2016/09/05 13:53:56]

It seems like base::PostTaskAndReplyWithResult used at
https://cs.chromium.org/chromium/src/content/browser/renderer_host/media/audi...
requires AudioOutputDeviceInfo to be copy-assignable.

+      output_params(output_params) {}
+
+AudioOutputDeviceInfo::AudioOutputDeviceInfo(
+    const AudioOutputDeviceInfo& audio_output_device_info) = default;
+
+AudioOutputDeviceInfo::AudioOutputDeviceInfo(
+    AudioOutputDeviceInfo&& audio_output_device_info) = default;
+
+AudioOutputDeviceInfo& AudioOutputDeviceInfo::operator=(
+    const AudioOutputDeviceInfo& audio_output_device_info) = default;
+
 AudioOutputDeviceEnumeration::AudioOutputDeviceEnumeration(
     const std::vector<AudioOutputDeviceInfo>& devices,
     bool has_actual_devices)