Switching audio clients to using RestartableAudioRendererSink interface as a sink.

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 50f54bdd436f24a3fb54df0597cf7074a3578b59..3fa884a807ef6425de43871224778fd8b53b0e4a 100644
--- a/media/base/audio_renderer_mixer_input.h
+++ b/media/base/audio_renderer_mixer_input.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "media/base/audio_converter.h"
-#include "media/base/audio_renderer_sink.h"
+#include "media/base/restartable_audio_output_device.h"
 #include "url/origin.h"
 
 namespace media {
@@ -18,8 +18,7 @@ namespace media {
 class AudioRendererMixer;
 
 class MEDIA_EXPORT AudioRendererMixerInput
-    : NON_EXPORTED_BASE(public RestartableAudioRendererSink),
-      NON_EXPORTED_BASE(public OutputDevice),
+    : public RestartableAudioOutputDevice,
       public AudioConverter::InputCallback {
  public:
   typedef base::Callback<AudioRendererMixer*(const AudioParameters& params,
@@ -32,8 +31,13 @@ class MEDIA_EXPORT AudioRendererMixerInput
                               const url::Origin& security_origin)>
       RemoveMixerCB;
 
+  typedef base::Callback<AudioParameters(const std::string& device_id,
+                                         const url::Origin& security_origin)>
+      GetHWParamsCB;
+
   AudioRendererMixerInput(const GetMixerCB& get_mixer_cb,
                           const RemoveMixerCB& remove_mixer_cb,
+                          const GetHWParamsCB& get_hw_params_cb,
                           const std::string& device_id,
                           const url::Origin& security_origin);
 
@@ -63,7 +67,7 @@ class MEDIA_EXPORT AudioRendererMixerInput
  private:
   friend class AudioRendererMixerInputTest;
 
-  bool initialized_;
+  bool started_;
   bool playing_;
   double volume_;
 
@@ -76,6 +80,10 @@ 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 GetHWParamsCB get_hw_params_cb_;
+
   // AudioParameters received during Initialize().
   AudioParameters params_;