Caching AudioOutputDevice instances in mixer manager

media/base/audio_renderer_mixer.h

Index: media/base/audio_renderer_mixer.h
diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h
index 7a6c1dd781bb96572e51dd71bbe96247d6ae6566..4d32dc6d7824b9840584e5c7d4d570d40361fe46 100644
--- a/media/base/audio_renderer_mixer.h
+++ b/media/base/audio_renderer_mixer.h
@@ -27,7 +27,7 @@ class MEDIA_EXPORT AudioRendererMixer
     : NON_EXPORTED_BASE(public AudioRendererSink::RenderCallback) {
  public:
   AudioRendererMixer(const AudioParameters& output_params,
-                     const scoped_refptr<AudioRendererSink>& sink);
+                     scoped_refptr<media::AudioRendererSink> sink);

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

Remove media:: this is already in media. Ditto below.

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

Done.

   ~AudioRendererMixer() override;
 
   // Add or remove a mixer input from mixing; called by AudioRendererMixerInput.
@@ -48,6 +48,8 @@ class MEDIA_EXPORT AudioRendererMixer
 
   OutputDeviceInfo GetOutputDeviceInfo();
 
+  const AudioRendererSink* sink_ptr() { return audio_sink_.get(); };

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

Needed? for_testing?

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

Needed, I put it into the comment.
Maybe you have an idea on how to make it cleaner? (Having mixer to call a
callback to release a sink or storing mixer sink pointers in ARMM does not look
good to me)

+
  private:
   // Maps input sample rate to the dedicated converter.
   using AudioConvertersMap =
@@ -64,10 +66,10 @@ class MEDIA_EXPORT AudioRendererMixer
   }
 
   // Output sink for this mixer.
-  scoped_refptr<AudioRendererSink> audio_sink_;
+  const scoped_refptr<media::AudioRendererSink> audio_sink_;
 
   // Output parameters for this mixer.
-  AudioParameters output_params_;
+  const AudioParameters output_params_;
 
   // ---------------[ All variables below protected by |lock_| ]---------------
   base::Lock lock_;