Implement MojoAudioRendererSink and use it in UtilityMojoMediaClient

media/mojo/clients/mojo_renderer.h

Index: media/mojo/clients/mojo_renderer.h
diff --git a/media/mojo/clients/mojo_renderer.h b/media/mojo/clients/mojo_renderer.h
index b8350ad7d8160d4e4d7317ecebba8a3f51067cbf..379db94e1ccebb8d90ec1572d277b774a7ef09e5 100644
--- a/media/mojo/clients/mojo_renderer.h
+++ b/media/mojo/clients/mojo_renderer.h
@@ -25,7 +25,9 @@ class SingleThreadTaskRunner;
 
 namespace media {
 
+class AudioRendererSink;
 class MediaResource;
+class MojoAudioRendererSinkImpl;
 class MojoDemuxerStreamImpl;
 class MojoVideoRendererSinkImpl;
 class VideoOverlayFactory;
@@ -45,6 +47,7 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
  public:
   MojoRenderer(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
                std::unique_ptr<VideoOverlayFactory> video_overlay_factory,
+               AudioRendererSink* audio_renderer_sink,
                VideoRendererSink* video_renderer_sink,
                mojom::RendererPtr remote_renderer);
   ~MojoRenderer() override;
@@ -104,6 +107,9 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
   // indicates which stream the error happened on.
   void OnDemuxerStreamConnectionError(MojoDemuxerStreamImpl* stream);
 
+  // Callback for connection error on |mojo_audio_renderer_sink_|.
+  void OnAudioRendererSinkConnectionError();
+
   // Callback for connection error on |mojo_video_renderer_sink_|.
   void OnVideoRendererSinkConnectionError();
 
@@ -122,6 +128,8 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
   // by the remote renderer.
   std::unique_ptr<VideoOverlayFactory> video_overlay_factory_;
 
+  AudioRendererSink* audio_renderer_sink_ = nullptr;
+
   // Video frame overlays are rendered onto this sink.
   // Rendering of a new overlay is only needed when video natural size changes.
   VideoRendererSink* video_renderer_sink_ = nullptr;
@@ -163,6 +171,7 @@ class MojoRenderer : public Renderer, public mojom::RendererClient {
   base::DefaultTickClock media_clock_;
   media::TimeDeltaInterpolator media_time_interpolator_;
 
+  std::unique_ptr<MojoAudioRendererSinkImpl> mojo_audio_renderer_sink_;
   std::unique_ptr<MojoVideoRendererSinkImpl> mojo_video_renderer_sink_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRenderer);