Remove renderer_service -> media_client dependency.

media/mojo/services/mojo_renderer_service.h

Index: media/mojo/services/mojo_renderer_service.h
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h
index e1f8cd19d7416bece190126ffe1716f24a4514a7..21a1fc45d14d8cd3e4d19b409f26cb4de85b6f94 100644
--- a/media/mojo/services/mojo_renderer_service.h
+++ b/media/mojo/services/mojo_renderer_service.h
@@ -5,18 +5,13 @@
 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
 
-#include "base/callback.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
-#include "media/base/audio_decoder_config.h"
 #include "media/base/buffering_state.h"
-#include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
-#include "media/mojo/services/mojo_cdm_service_context.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace mojo {
@@ -25,13 +20,9 @@ class ApplicationConnection;
 
 namespace media {
 
-class AudioRendererSink;
 class DemuxerStreamProviderShim;
 class CdmContextProvider;
-class MediaLog;
 class Renderer;
-class RendererFactory;
-class VideoRendererSink;
 
 // A interfaces::Renderer implementation that uses media::AudioRenderer to
 // decode and render audio to a sink obtained from the ApplicationConnection.
@@ -40,8 +31,7 @@ class MojoRendererService : interfaces::Renderer {
   // |cdm_context_provider| can be used to find the CdmContext to support
   // encrypted media. If null, encrypted media is not supported.
   MojoRendererService(base::WeakPtr<CdmContextProvider> cdm_context_provider,
-                      RendererFactory* renderer_factory,
-                      const scoped_refptr<MediaLog>& media_log,
+                      scoped_ptr<media::Renderer> renderer,
                       mojo::InterfaceRequest<interfaces::Renderer> request);
   ~MojoRendererService() final;
 
@@ -102,16 +92,13 @@ class MojoRendererService : interfaces::Renderer {
   mojo::StrongBinding<interfaces::Renderer> binding_;
 
   base::WeakPtr<CdmContextProvider> cdm_context_provider_;
+  scoped_ptr<media::Renderer> renderer_;
 
   State state_;
 
-  // Note: |renderer_| should be destructed before these objects to avoid access
+  // Note: stream_provider_ must be destructed after renderer_ to avoid access
   // violation.
   scoped_ptr<DemuxerStreamProviderShim> stream_provider_;
-  scoped_refptr<AudioRendererSink> audio_renderer_sink_;
-  scoped_ptr<VideoRendererSink> video_renderer_sink_;
-
-  scoped_ptr<media::Renderer> renderer_;
 
   base::RepeatingTimer time_update_timer_;
   uint64_t last_media_time_usec_;