Switching MediaStreamsManager from using AudioManager interface to AudioSystem one.

media/audio/audio_system_impl.cc

 // Copyright 2017 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_system_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "media/audio/audio_device_description.h"
@@ skipping 27 matching lines @@
   // AudioManager::Get[Default]OutputStreamParameters() returns invalid
   // parameters if the device is not found.
   if (!audio_manager->HasAudioOutputDevices())
     return AudioParameters();
 
   return media::AudioDeviceDescription::IsDefaultDevice(device_id)
              ? audio_manager->GetDefaultOutputStreamParameters()
              : audio_manager->GetOutputStreamParameters(device_id);
 }
 
+std::unique_ptr<AudioDeviceDescriptions> GetDeviceDescriptionsOnDeviceThread(
+    AudioManager* audio_manager,
+    bool for_input) {
+  DCHECK(audio_manager->GetTaskRunner()->BelongsToCurrentThread());
+  std::unique_ptr<AudioDeviceDescriptions> descriptions(
+      new AudioDeviceDescriptions);
+  if (for_input)
+    audio_manager->GetAudioInputDeviceDescriptions(descriptions.get());
+  else
+    audio_manager->GetAudioOutputDeviceDescriptions(descriptions.get());
+  return descriptions;
+}
+
 }  // namespace
 
 AudioSystemImpl::AudioSystemImpl(AudioManager* audio_manager)
     : audio_manager_(audio_manager) {
   DCHECK(audio_manager_);
   AudioSystem::SetInstance(this);
 }
 
 AudioSystemImpl::~AudioSystemImpl() {
   AudioSystem::ClearInstance(this);
@@ skipping 44 matching lines @@
         base::Bind(on_has_devices_cb, audio_manager_->HasAudioInputDevices()));
     return;
   }
   base::PostTaskAndReplyWithResult(
       GetTaskRunner(), FROM_HERE,
       base::Bind(&AudioManager::HasAudioInputDevices,
                  base::Unretained(audio_manager_)),
       std::move(on_has_devices_cb));
 }
 
+void AudioSystemImpl::GetDeviceDescriptions(
+    OnDeviceDescriptionsCallback on_descriptions_cp,
+    bool for_input) {
+  if (GetTaskRunner()->BelongsToCurrentThread()) {
+    GetTaskRunner()->PostTask(
+        FROM_HERE, base::Bind(on_descriptions_cp,
+                              base::Passed(GetDeviceDescriptionsOnDeviceThread(
+                                  audio_manager_, for_input))));
+    return;
+  }
+
+  base::PostTaskAndReplyWithResult(
+      GetTaskRunner(), FROM_HERE,
+      base::Bind(&GetDeviceDescriptionsOnDeviceThread,
+                 base::Unretained(audio_manager_), for_input),
+      std::move(on_descriptions_cp));
+}
+
 AudioManager* AudioSystemImpl::GetAudioManager() const {
   return audio_manager_;
 }
 
 base::SingleThreadTaskRunner* AudioSystemImpl::GetTaskRunner() const {
   return audio_manager_->GetTaskRunner();
 }
 
 }  // namespace media