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 34f37c5ee00a3c0d0803ef4f807992942bbf8401..56685388b591f25b80c24d80a313ad4b6844d61d 100644
--- a/media/base/audio_renderer_mixer_input.h
+++ b/media/base/audio_renderer_mixer_input.h
@@ -19,8 +19,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,
@@ -33,17 +32,17 @@ 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;
+  typedef base::Callback<OutputDevice*(const std::string& device_id,
+                                       const url::Origin& security_origin)>
+      GetOutputDeviceCB;
 
   AudioRendererMixerInput(const GetMixerCB& get_mixer_cb,
                           const RemoveMixerCB& remove_mixer_cb,
-                          const GetHardwareParamsCB& get_hardware_params_cb,
+                          const GetOutputDeviceCB& get_output_device_cb,
                           const std::string& device_id,
                           const url::Origin& security_origin);
 
-  // RestartableAudioRendererSink implementation.
+  // SwitchableAudioRendererSink implementation.
   void Start() override;
   void Stop() override;
   void Play() override;
@@ -52,13 +51,9 @@ class MEDIA_EXPORT AudioRendererMixerInput
   OutputDevice* GetOutputDevice() 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;
 
   // Called by AudioRendererMixer when an error occurs.
   void OnRenderError();
@@ -83,8 +78,8 @@ class MEDIA_EXPORT AudioRendererMixerInput
   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_;
+  // to access output device when no mixer is attached.
+  const GetOutputDeviceCB get_output_device_cb_;
 
   // AudioParameters received during Initialize().
   AudioParameters params_;