Remove renderer_service -> media_client dependency.

media/mojo/services/mojo_renderer_service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 {
 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.
 class MojoRendererService : interfaces::Renderer {
  public:
   // |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;
 
   // interfaces::Renderer implementation.
   void Initialize(interfaces::RendererClientPtr client,
                   interfaces::DemuxerStreamPtr audio,
                   interfaces::DemuxerStreamPtr video,
                   const mojo::Callback<void(bool)>& callback) final;
   void Flush(const mojo::Closure& callback) final;
   void StartPlayingFrom(int64_t time_delta_usec) final;
@@ skipping 40 matching lines @@
 
   // Callback executed once Flush() completes.
   void OnFlushCompleted(const mojo::Closure& callback);
 
   // Callback executed once SetCdm() completes.
   void OnCdmAttached(const mojo::Callback<void(bool)>& callback, bool success);
 
   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_;
 
   interfaces::RendererClientPtr client_;
 
   base::WeakPtr<MojoRendererService> weak_this_;
   base::WeakPtrFactory<MojoRendererService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_