Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

media/audio/audio_output_device.cc

Index: media/audio/audio_output_device.cc
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index e6dcb11baf485f5996df30960b76897bb8f544e2..05b123f780a050021bdf54d40ddb311045e0984a 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -16,7 +16,7 @@
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
-#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/audio_output_controller.h"
 #include "media/base/limits.h"
 
@@ -142,11 +142,11 @@ bool AudioOutputDevice::SetVolume(double volume) {
 OutputDeviceInfo AudioOutputDevice::GetOutputDeviceInfo() {
   CHECK(!task_runner()->BelongsToCurrentThread());
   did_receive_auth_.Wait();
-  return OutputDeviceInfo(
-      AudioManagerBase::UseSessionIdToSelectDevice(session_id_, device_id_)
-          ? matched_device_id_
-          : device_id_,
-      device_status_, output_params_);
+  return OutputDeviceInfo(AudioDeviceDescription::UseSessionIdToSelectDevice(
+                              session_id_, device_id_)
+                              ? matched_device_id_
+                              : device_id_,
+                          device_status_, output_params_);
 }
 
 void AudioOutputDevice::RequestDeviceAuthorizationOnIOThread() {
@@ -305,8 +305,8 @@ void AudioOutputDevice::OnDeviceAuthorized(
       // It's possible to not have a matched device obtained via session id. It
       // means matching output device through |session_id_| failed and the
       // default device is used.
-      DCHECK(AudioManagerBase::UseSessionIdToSelectDevice(session_id_,
-                                                          device_id_) ||
+      DCHECK(AudioDeviceDescription::UseSessionIdToSelectDevice(session_id_,
+                                                                device_id_) ||
              matched_device_id_.empty());
       matched_device_id_ = matched_device_id;