[Chromecast] Upgrade to new CMA backend API

chromecast/browser/media/media_pipeline_host.h

Index: chromecast/browser/media/media_pipeline_host.h
diff --git a/chromecast/browser/media/media_pipeline_host.h b/chromecast/browser/media/media_pipeline_host.h
index db26bb9390cf1b5c609308d37957d5053b14f9ab..510e4927bc501a1db98b61b92e97db05aedc9d92 100644
--- a/chromecast/browser/media/media_pipeline_host.h
+++ b/chromecast/browser/media/media_pipeline_host.h
@@ -31,38 +31,39 @@ namespace chromecast {
 class TaskRunnerImpl;
 
 namespace media {
-struct AvPipelineClient;
+struct BrowserAvPipelineClient;
 class BrowserCdmCast;
+struct BrowserMediaPipelineClient;
+struct BrowserVideoPipelineClient;
+class CodedFrameProvider;
 class MediaPipelineBackend;
-struct MediaPipelineClient;
 struct MediaPipelineDeviceParams;
 class MediaPipelineImpl;
-struct VideoPipelineClient;
 
 class MediaPipelineHost {
  public:
   // Factory method to create a MediaPipelineBackend
-  typedef base::Callback<scoped_ptr<media::MediaPipelineBackend>(
-      const MediaPipelineDeviceParams&)> CreateDeviceComponentsCB;
+  typedef base::Callback<scoped_ptr<MediaPipelineBackend>(
+      const MediaPipelineDeviceParams&)> CreateBackendCB;
 
   MediaPipelineHost();
   ~MediaPipelineHost();
 
   void Initialize(LoadType load_type,
-                  const MediaPipelineClient& client,
-                  const CreateDeviceComponentsCB& create_device_components_cb);
+                  const BrowserMediaPipelineClient& client,
+                  const CreateBackendCB& create_backend_cb);
 
   void SetAvPipe(TrackId track_id,
                  scoped_ptr<base::SharedMemory> shared_mem,
                  const base::Closure& pipe_read_activity_cb,
                  const base::Closure& av_pipe_set_cb);
   void AudioInitialize(TrackId track_id,
-                       const AvPipelineClient& client,
+                       const BrowserAvPipelineClient& client,
                        const ::media::AudioDecoderConfig& config,
                        const ::media::PipelineStatusCB& status_cb);
   void VideoInitialize(TrackId track_id,
-                       const VideoPipelineClient& client,
-                       const std::vector<::media::VideoDecoderConfig>& configs,
+                       const BrowserVideoPipelineClient& client,
+                       const std::vector< ::media::VideoDecoderConfig>& configs,
                        const ::media::PipelineStatusCB& status_cb);
   void StartPlayingFrom(base::TimeDelta time);
   void Flush(const ::media::PipelineStatusCB& status_cb);
@@ -80,6 +81,9 @@ class MediaPipelineHost {
   scoped_ptr<TaskRunnerImpl> task_runner_;
   scoped_ptr<MediaPipelineImpl> media_pipeline_;
 
+  scoped_ptr<CodedFrameProvider> audio_frame_provider_;
+  scoped_ptr<CodedFrameProvider> video_frame_provider_;
+
   // The shared memory for a track id must be valid until Stop is invoked on
   // that track id.
   struct MediaTrackHost;