| Index: chromecast/renderer/media/audio_pipeline_proxy.cc
|
| diff --git a/chromecast/renderer/media/audio_pipeline_proxy.cc b/chromecast/renderer/media/audio_pipeline_proxy.cc
|
| index 30297a8a549b2c1c696653b563cc444b57745b94..d91650c29eb67fb6a6e827d7bc6b3a1bc1188f68 100644
|
| --- a/chromecast/renderer/media/audio_pipeline_proxy.cc
|
| +++ b/chromecast/renderer/media/audio_pipeline_proxy.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chromecast/renderer/media/audio_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/pipeline/av_pipeline_client.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 {
|
| @@ -226,7 +226,7 @@ AudioPipelineProxy::~AudioPipelineProxy() {
|
| void AudioPipelineProxy::SetClient(
|
| const AvPipelineClient& client) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - base::Closure pipe_read_cb = ::media::BindToCurrentLoop(
|
| + base::Closure pipe_read_cb = base::BindToCurrentLoop(
|
| base::Bind(&AudioPipelineProxy::OnPipeRead, weak_this_));
|
| FORWARD_ON_IO_THREAD(SetClient, pipe_read_cb, client);
|
| }
|
| @@ -240,7 +240,7 @@ void AudioPipelineProxy::Initialize(
|
| audio_streamer_->SetCodedFrameProvider(frame_provider.Pass());
|
|
|
| AudioPipelineProxyInternal::SharedMemCB shared_mem_cb =
|
| - ::media::BindToCurrentLoop(base::Bind(
|
| + base::BindToCurrentLoop(base::Bind(
|
| &AudioPipelineProxy::OnAvPipeCreated, weak_this_,
|
| config, status_cb));
|
| FORWARD_ON_IO_THREAD(CreateAvPipe, shared_mem_cb);
|
| @@ -307,5 +307,5 @@ void AudioPipelineProxy::OnPipeRead() {
|
| audio_streamer_->OnFifoReadEvent();
|
| }
|
|
|
| -} // namespace cma
|
| -} // namespace chromecast
|
| +} // namespace media
|
| +} // namespace chromecast
|
|
|