| Index: chromecast/renderer/media/video_pipeline_proxy.cc
|
| diff --git a/chromecast/renderer/media/video_pipeline_proxy.cc b/chromecast/renderer/media/video_pipeline_proxy.cc
|
| index 6c924cd4e2e4e39e01547a40273e1bf8bc16d234..36249e37aff8675e58600e9cbefceca53b3411ef 100644
|
| --- a/chromecast/renderer/media/video_pipeline_proxy.cc
|
| +++ b/chromecast/renderer/media/video_pipeline_proxy.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chromecast/renderer/media/video_pipeline_proxy.h"
|
|
|
| #include "base/bind.h"
|
| +#include "base/bind_to_current_loop.h"
|
| #include "base/callback_helpers.h"
|
| #include "base/memory/shared_memory.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -19,7 +20,6 @@
|
| #include "chromecast/media/cma/ipc_streamer/av_streamer_proxy.h"
|
| #include "chromecast/renderer/media/cma_message_filter_proxy.h"
|
| #include "chromecast/renderer/media/media_channel_proxy.h"
|
| -#include "media/base/bind_to_current_loop.h"
|
| #include "media/base/pipeline_status.h"
|
|
|
| namespace chromecast {
|
| @@ -219,7 +219,7 @@ void VideoPipelineProxy::SetClient(
|
| const VideoPipelineClient& video_client) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| base::Closure pipe_read_cb =
|
| - ::media::BindToCurrentLoop(
|
| + base::BindToCurrentLoop(
|
| base::Bind(&VideoPipelineProxy::OnPipeRead, weak_this_));
|
| FORWARD_ON_IO_THREAD(SetClient, pipe_read_cb, video_client);
|
| }
|
| @@ -233,7 +233,7 @@ void VideoPipelineProxy::Initialize(
|
| video_streamer_->SetCodedFrameProvider(frame_provider.Pass());
|
|
|
| VideoPipelineProxyInternal::SharedMemCB shared_mem_cb =
|
| - ::media::BindToCurrentLoop(base::Bind(
|
| + base::BindToCurrentLoop(base::Bind(
|
| &VideoPipelineProxy::OnAvPipeCreated, weak_this_,
|
| config, status_cb));
|
| FORWARD_ON_IO_THREAD(CreateAvPipe, shared_mem_cb);
|
| @@ -296,4 +296,4 @@ void VideoPipelineProxy::OnPipeRead() {
|
| }
|
|
|
| } // namespace media
|
| -} // namespace chromecast
|
| +} // namespace chromecast
|
|
|