Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

content/renderer/media/audio_renderer_mixer_manager.h

Index: content/renderer/media/audio_renderer_mixer_manager.h
diff --git a/content/renderer/media/audio_renderer_mixer_manager.h b/content/renderer/media/audio_renderer_mixer_manager.h
index 8b13388de2599c7acbf4d968f1b80d5b8d97b60e..42164031bce3331a5d5995cff8ecc848f79efa5f 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.h
+++ b/content/renderer/media/audio_renderer_mixer_manager.h
@@ -122,9 +122,8 @@ class CONTENT_EXPORT AudioRendererMixerManager {
   // Overrides the AudioRendererSink implementation for unit testing.
   void SetAudioRendererSinkForTesting(media::AudioRendererSink* sink);
 
-  // A helper to get hardware output parameters in the absence of
-  // AudioOutputDevice.
-  static media::AudioParameters GetHardwareOutputParams(
+  // A helper provided to AudioRendererMixerInput to access output device
+  static media::OutputDevice* GetOutputDevice(
       int render_frame_id,
       int session_id,
       const std::string& device_id,
@@ -134,8 +133,6 @@ class CONTENT_EXPORT AudioRendererMixerManager {
   AudioRendererMixerMap mixers_;
   base::Lock mixers_lock_;
 
-  media::AudioRendererSink* sink_for_testing_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager);
 };