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

media/audio/audio_device_description.h

Index: media/audio/audio_device_description.h
diff --git a/media/audio/audio_device_description.h b/media/audio/audio_device_description.h
index bc70e237fd065659a08058cb30eff5a68b9b63c5..1c7754d62095ee28127e52cc0e54c45d9d7a750e 100644
--- a/media/audio/audio_device_description.h
+++ b/media/audio/audio_device_description.h
@@ -5,14 +5,14 @@
 #ifndef MEDIA_AUDIO_AUDIO_DEVICE_DESCRIPTION_H_
 #define MEDIA_AUDIO_AUDIO_DEVICE_DESCRIPTION_H_
 
+#include <list>
 #include <string>
 #include "media/base/media_export.h"
 
 namespace media {
 
 // Provides common information on audio device names and ids.
-class MEDIA_EXPORT AudioDeviceDescription {
- public:
+struct MEDIA_EXPORT AudioDeviceDescription {
   // Unique Id of the generic "default" device. Associated with the localized
   // name returned from GetDefaultDeviceName().
   static const char kDefaultDeviceId[];
@@ -53,11 +53,21 @@ class MEDIA_EXPORT AudioDeviceDescription {
   // This device is not supported on all platforms.
   static std::string GetCommunicationsDeviceName();
 
- private:
-  AudioDeviceDescription() {}
-  ~AudioDeviceDescription() {}
+  //  AudioDeviceDescription() = default;
+  //  AudioDeviceDescription(const AudioDeviceDescription&) = default;
+  AudioDeviceDescription(const std::string& device_name,
+                         const std::string& unique_id,
+                         const std::string& group_id);
+
+  ~AudioDeviceDescription() = default;
+
+  std::string device_name;  // Friendly name of the device.
+  std::string unique_id;    // Unique identifier for the device.
+  std::string group_id;     // Group identifier.

[mcasas, 2016/12/08 16:37:01]

These three should be const, right?

[o1ka, 2016/12/09 14:56:30]

Not really. It's a standard Chrome-style structure, if we want it to be const
that we can declare the whole structure as const.
Also if they are const we can't store them in a vector, which seems to be an
unnecessary restriction.

 };
 
+typedef std::list<AudioDeviceDescription> AudioDeviceDescriptions;

[Guido Urdaneta, 2016/12/08 15:53:37]

why list and not vector?

[mcasas, 2016/12/08 16:37:01]

No typedef anymore, use "using"

[o1ka, 2016/12/09 14:56:30]

"using declaration cannot refer to a template specialization"

[o1ka, 2016/12/09 14:56:30]

Just because AudioDeviceNames are a list as well. Switched to vector.

+
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_DEVICE_DESCRIPTION_H_