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

content/browser/renderer_host/media/audio_output_device_enumerator.cc

 // Copyright (c) 2015 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/audio_output_device_enumerator.h"
 
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
@@ skipping 13 matching lines @@
   media::AudioDeviceNames device_names;
   audio_manager->GetAudioOutputDeviceNames(&device_names);
 
   snapshot.has_actual_devices = !device_names.empty();
 
   // If no devices in enumeration, return a list with a default device
   if (!snapshot.has_actual_devices) {
     snapshot.devices.push_back(
         {media::AudioDeviceDescription::kDefaultDeviceId,
          media::AudioDeviceDescription::GetDefaultDeviceName(),
+         audio_manager->GetGroupIDOutput(
+             media::AudioDeviceDescription::kDefaultDeviceId),
          audio_manager->GetDefaultOutputStreamParameters()});
     return snapshot;
   }
 
   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)});
   }
   return snapshot;
 }
 
 }  // 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)
     : devices(devices), has_actual_devices(has_actual_devices) {}
 
 AudioOutputDeviceEnumeration::AudioOutputDeviceEnumeration()
     : has_actual_devices(false) {}
 
 AudioOutputDeviceEnumeration::AudioOutputDeviceEnumeration(
     const AudioOutputDeviceEnumeration& other) = default;
@@ skipping 87 matching lines @@
   return ++current_event_sequence_;
 }
 
 bool AudioOutputDeviceEnumerator::IsLastEnumerationValid() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return seq_last_enumeration_ > seq_last_invalidation_ &&
          !is_enumeration_ongoing_;
 }
 
 }  // namespace content