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

content/browser/renderer_host/media/audio_output_device_enumerator.h

 // 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.
 
 // AudioOutputDeviceEnumerator is used to enumerate audio output devices.
 // It can return cached results of previous enumerations in order to boost
 // performance.
 // All its public methods must be called on the thread where the object is
 // created.
 
@@ skipping 21 matching lines @@
 namespace media {
 class AudioManager;
 }
 
 namespace content {
 
 // AudioOutputDeviceInfo describes information about an audio output device.
 // The enumerations returned by AudioOutputDeviceEnumerator::Enumerate() contain
 // elements of this type. It is used only in the browser side.
 struct AudioOutputDeviceInfo {
+  AudioOutputDeviceInfo();
+  AudioOutputDeviceInfo(const AudioOutputDeviceInfo& audio_output_device_info);
+  AudioOutputDeviceInfo(AudioOutputDeviceInfo&& audio_output_device_info);
+  AudioOutputDeviceInfo& operator=(
+      const AudioOutputDeviceInfo& audio_output_device_info);
+  AudioOutputDeviceInfo(const std::string& unique_id,
+                        const std::string& device_name,
+                        const std::string& group_id,
+                        media::AudioParameters output_params);
+  ~AudioOutputDeviceInfo();
   std::string unique_id;
   std::string device_name;
+  std::string group_id;
   media::AudioParameters output_params;
 };
 
 // The result of an enumeration. It is used only in the browser side.
 struct AudioOutputDeviceEnumeration {
  public:
   AudioOutputDeviceEnumeration(
       const std::vector<AudioOutputDeviceInfo>& devices,
       bool has_actual_devices);
   AudioOutputDeviceEnumeration();
@@ skipping 62 matching lines @@
 
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<AudioOutputDeviceEnumerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDeviceEnumerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_OUTPUT_DEVICE_ENUMERATOR_H_