| Index: chromecast/renderer/media/media_pipeline_proxy.cc
|
| diff --git a/chromecast/renderer/media/media_pipeline_proxy.cc b/chromecast/renderer/media/media_pipeline_proxy.cc
|
| index 38a69980c6b43aded1d0a01d0ddd69e062da2b5e..3ee37dc8c91fac24d3589f62b540a6fc60985f54 100644
|
| --- a/chromecast/renderer/media/media_pipeline_proxy.cc
|
| +++ b/chromecast/renderer/media/media_pipeline_proxy.cc
|
| @@ -29,7 +29,7 @@ class MediaPipelineProxyInternal {
|
| scoped_refptr<MediaChannelProxy> media_channel_proxy);
|
| virtual ~MediaPipelineProxyInternal();
|
|
|
| - void SetClient(const MediaPipelineClient& client);
|
| + void SetClient(const RendererMediaPipelineClient& client);
|
| void SetCdm(int render_frame_id, int cdm_id);
|
| void StartPlayingFrom(const base::TimeDelta& time);
|
| void Flush(const ::media::PipelineStatusCB& status_cb);
|
| @@ -46,7 +46,7 @@ class MediaPipelineProxyInternal {
|
|
|
| scoped_refptr<MediaChannelProxy> media_channel_proxy_;
|
|
|
| - MediaPipelineClient client_;
|
| + RendererMediaPipelineClient client_;
|
|
|
| // Store the callback for a pending state transition.
|
| ::media::PipelineStatusCB status_cb_;
|
| @@ -81,7 +81,7 @@ void MediaPipelineProxyInternal::Shutdown() {
|
| }
|
|
|
| void MediaPipelineProxyInternal::SetClient(
|
| - const MediaPipelineClient& client) {
|
| + const RendererMediaPipelineClient& client) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK(!client.error_cb.is_null());
|
| DCHECK(!client.buffering_state_cb.is_null());
|
| @@ -185,8 +185,7 @@ MediaPipelineProxy::~MediaPipelineProxy() {
|
| FROM_HERE, base::Bind(&MediaChannelProxy::Close, media_channel_proxy_));
|
| }
|
|
|
| -void MediaPipelineProxy::SetClient(
|
| - const MediaPipelineClient& client) {
|
| +void MediaPipelineProxy::SetClient(const RendererMediaPipelineClient& client) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| FORWARD_ON_IO_THREAD(SetClient, client);
|
| }
|
|
|