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

media/audio/audio_manager_base.cc

 // Copyright (c) 2012 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 "media/audio/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 84 matching lines @@
   // All the output streams should have been deleted.
   CHECK_EQ(0, num_output_streams_);
   // All the input streams should have been deleted.
   CHECK(input_streams_.empty());
 }
 
 base::string16 AudioManagerBase::GetAudioInputDeviceModel() {
   return base::string16();
 }
 
+void AudioManagerBase::GetAudioInputDeviceDescriptions(
+    AudioDeviceDescriptions* device_descriptions) {
+  AudioDeviceNames device_names;
+  GetAudioInputDeviceNames(&device_names);

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

Should this have a CHECK(GetTaskRunner()->BelongToCurrentThread())?

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

Done.

+
+  for (const media::AudioDeviceName& name : device_names) {
+    device_descriptions->emplace_back(name.device_name, name.unique_id,
+                                      GetGroupIDInput(name.unique_id));
+  }
+}
+void AudioManagerBase::GetAudioOutputDeviceDescriptions(
+    AudioDeviceDescriptions* device_descriptions) {
+  AudioDeviceNames device_names;
+  GetAudioOutputDeviceNames(&device_names);
+
+  for (const media::AudioDeviceName& name : device_names) {
+    device_descriptions->emplace_back(name.device_name, name.unique_id,
+                                      GetGroupIDOutput(name.unique_id));
+  }
+}
+
 AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
     const AudioParameters& params,
     const std::string& device_id,
     const LogCallback& log_callback) {
   CHECK(GetTaskRunner()->BelongsToCurrentThread());
 
   if (!params.IsValid()) {
     DLOG(ERROR) << "Audio parameters are invalid";
     return NULL;
   }
@@ skipping 273 matching lines @@
     // giving the input the same group id as an output.
     return input_device_id + "input";
   }
   return GetGroupIDOutput(output_device_id);
 }
 
 std::string AudioManagerBase::GetDefaultOutputDeviceID() {
   return "";
 }
 
+// static
 int AudioManagerBase::GetUserBufferSize() {
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   int buffer_size = 0;
   std::string buffer_size_str(cmd_line->GetSwitchValueASCII(
       switches::kAudioBufferSize));
   if (base::StringToInt(buffer_size_str, &buffer_size) && buffer_size > 0)
     return buffer_size;
 
   return 0;
 }
 
 std::unique_ptr<AudioLog> AudioManagerBase::CreateAudioLog(
     AudioLogFactory::AudioComponent component) {
   return audio_log_factory_->CreateAudioLog(component);
 }
 
 }  // namespace media