Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/audio_renderer_mixer_input.h

Index: media/base/audio_renderer_mixer_input.h
diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h
index 9d91b1481892afc8d734f4f271989ffa7baf860f..a75320e78c681c73303c8d65bca0f9fb8a7cfd30 100644
--- a/media/base/audio_renderer_mixer_input.h
+++ b/media/base/audio_renderer_mixer_input.h
@@ -23,7 +23,6 @@
 #include "base/synchronization/lock.h"
 #include "media/base/audio_converter.h"
 #include "media/base/audio_renderer_sink.h"
-#include "media/base/output_device.h"
 #include "url/origin.h"
 
 namespace media {
@@ -31,8 +30,7 @@ namespace media {
 class AudioRendererMixer;
 
 class MEDIA_EXPORT AudioRendererMixerInput
-    : NON_EXPORTED_BASE(public RestartableAudioRendererSink),
-      NON_EXPORTED_BASE(public OutputDevice),
+    : NON_EXPORTED_BASE(public SwitchableAudioRendererSink),
       public AudioConverter::InputCallback {
  public:
   typedef base::Callback<AudioRendererMixer*(const AudioParameters& params,
@@ -45,32 +43,23 @@ class MEDIA_EXPORT AudioRendererMixerInput
                               const url::Origin& security_origin)>
       RemoveMixerCB;
 
-  typedef base::Callback<AudioParameters(const std::string& device_id,
-                                         const url::Origin& security_origin)>
-      GetHardwareParamsCB;
-
   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);
 
-  // RestartableAudioRendererSink implementation.
+  // SwitchableAudioRendererSink implementation.
   void Start() override;
   void Stop() override;
   void Play() override;
   void Pause() override;
   bool SetVolume(double volume) override;
-  OutputDevice* GetOutputDevice() override;
+  OutputDeviceInfo GetOutputDeviceInfo() override;
   void Initialize(const AudioParameters& params,
                   AudioRendererSink::RenderCallback* renderer) override;
-
-  // OutputDevice implementation.
   void SwitchOutputDevice(const std::string& device_id,
                           const url::Origin& security_origin,
-                          const SwitchOutputDeviceCB& callback) override;
-  AudioParameters GetOutputParameters() override;
-  OutputDeviceStatus GetDeviceStatus() override;
+                          const OutputDeviceStatusCB& callback) override;
 
   // Called by AudioRendererMixer when an error occurs.
   void OnRenderError();
@@ -98,10 +87,6 @@ class MEDIA_EXPORT AudioRendererMixerInput
   const GetMixerCB get_mixer_cb_;
   const RemoveMixerCB remove_mixer_cb_;
 
-  // Callbacks provided during construction which allows AudioRendererMixerInput
-  // to access hardware output parameters when it is detached from the mixer.
-  const GetHardwareParamsCB get_hardware_params_cb_;
-
   // AudioParameters received during Initialize().
   AudioParameters params_;
 
@@ -121,7 +106,7 @@ class MEDIA_EXPORT AudioRendererMixerInput
 
   // Pending switch-device callback, in case SwitchOutputDevice() is invoked
   // before Start()
-  SwitchOutputDeviceCB pending_switch_callback_;
+  OutputDeviceStatusCB pending_switch_callback_;
   std::string pending_switch_device_id_;
   url::Origin pending_switch_security_origin_;