Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/audio_renderer_mixer_input.cc

Index: media/base/audio_renderer_mixer_input.cc
diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc
index e47cbea3845af27576be54424e3485382f27f37a..55dbfc8404f76d012cc8550ce2e45f16f7f0bec0 100644
--- a/media/base/audio_renderer_mixer_input.cc
+++ b/media/base/audio_renderer_mixer_input.cc
@@ -15,7 +15,6 @@ namespace media {
 AudioRendererMixerInput::AudioRendererMixerInput(
     const GetMixerCB& get_mixer_cb,
     const RemoveMixerCB& remove_mixer_cb,
-    const GetHardwareParamsCB& get_hardware_params_cb,
     const std::string& device_id,
     const url::Origin& security_origin)
     : started_(false),
@@ -23,7 +22,6 @@ AudioRendererMixerInput::AudioRendererMixerInput(
       volume_(1.0f),
       get_mixer_cb_(get_mixer_cb),
       remove_mixer_cb_(remove_mixer_cb),
-      get_hardware_params_cb_(get_hardware_params_cb),
       device_id_(device_id),
       security_origin_(security_origin),
       mixer_(nullptr),
@@ -113,14 +111,14 @@ bool AudioRendererMixerInput::SetVolume(double volume) {
   return true;
 }
 
-OutputDevice* AudioRendererMixerInput::GetOutputDevice() {
-  return this;
+OutputDeviceInfo AudioRendererMixerInput::GetOutputDeviceInfo() {
+  return mixer_ ? mixer_->GetOutputDeviceInfo() : OutputDeviceInfo();
 }
 
 void AudioRendererMixerInput::SwitchOutputDevice(
     const std::string& device_id,
     const url::Origin& security_origin,
-    const SwitchOutputDeviceCB& callback) {
+    const OutputDeviceStatusCB& callback) {
   if (!mixer_) {
     if (pending_switch_callback_.is_null()) {
       pending_switch_callback_ = callback;
@@ -161,22 +159,6 @@ void AudioRendererMixerInput::SwitchOutputDevice(
   callback.Run(OUTPUT_DEVICE_STATUS_OK);
 }
 
-AudioParameters AudioRendererMixerInput::GetOutputParameters() {
-  if (mixer_)
-    return mixer_->GetOutputDevice()->GetOutputParameters();
-  return get_hardware_params_cb_.Run(device_id_, security_origin_);
-}
-
-OutputDeviceStatus AudioRendererMixerInput::GetDeviceStatus() {
-  if (mixer_)
-    return mixer_->GetOutputDevice()->GetDeviceStatus();
-
-  if (started_)
-    return OUTPUT_DEVICE_STATUS_ERROR_INTERNAL;
-
-  return OUTPUT_DEVICE_STATUS_OK;
-}
-
 double AudioRendererMixerInput::ProvideInput(AudioBus* audio_bus,
                                              base::TimeDelta buffer_delay) {
   // TODO(chcunningham): Delete this conversion and change ProvideInput to more