Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/audio_renderer_mixer.cc

Index: media/base/audio_renderer_mixer.cc
diff --git a/media/base/audio_renderer_mixer.cc b/media/base/audio_renderer_mixer.cc
index a2b5e89389b6ce7f2b4629df5166205b385726f4..d6cca18c40f58c33adb85007162e41accde0e69f 100644
--- a/media/base/audio_renderer_mixer.cc
+++ b/media/base/audio_renderer_mixer.cc
@@ -112,10 +112,10 @@ void AudioRendererMixer::RemoveErrorCallback(const base::Closure& error_cb) {
   NOTREACHED();
 }
 
-OutputDevice* AudioRendererMixer::GetOutputDevice() {
+OutputDeviceInfo AudioRendererMixer::GetOutputDeviceInfo() {
   DVLOG(1) << __FUNCTION__;
   base::AutoLock auto_lock(lock_);
-  return audio_sink_->GetOutputDevice();
+  return audio_sink_->GetOutputDeviceInfo();
 }
 
 int AudioRendererMixer::Render(AudioBus* audio_bus,