Caching AudioOutputDevice instances in mixer manager

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 10a19cded57347cfc31fc10a901050c680f671f6..3a9ffa342716161dec73fd79e0c643baffb9b983 100644
--- a/media/base/audio_renderer_mixer.cc
+++ b/media/base/audio_renderer_mixer.cc
@@ -17,7 +17,7 @@ enum { kPauseDelaySeconds = 10 };
 
 AudioRendererMixer::AudioRendererMixer(
     const AudioParameters& output_params,
-    const scoped_refptr<AudioRendererSink>& sink)
+    scoped_refptr<media::AudioRendererSink> sink)

[DaleCurtis, 2016/05/17 19:13:48]

Ditto.

[o1ka, 2016/05/18 13:15:12]

Done.

     : audio_sink_(sink),
       output_params_(output_params),
       master_converter_(output_params, output_params, true),
@@ -25,12 +25,13 @@ AudioRendererMixer::AudioRendererMixer(
       last_play_time_(base::TimeTicks::Now()),
       // Initialize |playing_| to true since Start() results in an auto-play.
       playing_(true) {
+  DCHECK(audio_sink_);
   audio_sink_->Initialize(output_params, this);
   audio_sink_->Start();
 }
 
 AudioRendererMixer::~AudioRendererMixer() {
-  // AudioRendererSinks must be stopped before being destructed.
+  // AudioRendererSink must be stopped before mixer is destructed.
   audio_sink_->Stop();
 
   // Ensure that all mixer inputs have removed themselves prior to destruction.