Move BindToCurrentLoop from media/base/ to base/

chromecast/media/cma/filters/cma_renderer.cc

Index: chromecast/media/cma/filters/cma_renderer.cc
diff --git a/chromecast/media/cma/filters/cma_renderer.cc b/chromecast/media/cma/filters/cma_renderer.cc
index bc29b4f46ce97f9771243efe4237c50cea34c33b..3eb4ad5c59fb5f895d4f25911cd6c36f0477e675 100644
--- a/chromecast/media/cma/filters/cma_renderer.cc
+++ b/chromecast/media/cma/filters/cma_renderer.cc
@@ -5,6 +5,7 @@
 #include "chromecast/media/cma/filters/cma_renderer.h"
 
 #include "base/bind.h"
+#include "base/bind_to_current_loop.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ -17,7 +18,6 @@
 #include "chromecast/media/cma/pipeline/media_pipeline_client.h"
 #include "chromecast/media/cma/pipeline/video_pipeline.h"
 #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
-#include "media/base/bind_to_current_loop.h"
 #include "media/base/demuxer_stream_provider.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/time_delta_interpolator.h"
@@ -106,9 +106,9 @@ void CmaRenderer::Initialize(
 
   MediaPipelineClient media_pipeline_client;
   media_pipeline_client.error_cb = error_cb_;
-  media_pipeline_client.buffering_state_cb = ::media::BindToCurrentLoop(
+  media_pipeline_client.buffering_state_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnBufferingNotification, weak_this_));
-  media_pipeline_client.time_update_cb = ::media::BindToCurrentLoop(
+  media_pipeline_client.time_update_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnPlaybackTimeUpdated, weak_this_));
   media_pipeline_->SetClient(media_pipeline_client);
 
@@ -131,7 +131,7 @@ void CmaRenderer::Flush(const base::Closure& flush_cb) {
 
   DCHECK_EQ(state_, kPlaying) << state_;
   media_pipeline_->Flush(
-      ::media::BindToCurrentLoop(
+      base::BindToCurrentLoop(
           base::Bind(&CmaRenderer::OnFlushDone, weak_this_)));
 
   {
@@ -233,7 +233,7 @@ void CmaRenderer::InitializeAudioPipeline() {
   DCHECK(!init_cb_.is_null());
 
   ::media::PipelineStatusCB audio_initialization_done_cb =
-      ::media::BindToCurrentLoop(
+      base::BindToCurrentLoop(
           base::Bind(&CmaRenderer::OnAudioPipelineInitializeDone, weak_this_));
 
   ::media::DemuxerStream* stream =
@@ -245,11 +245,11 @@ void CmaRenderer::InitializeAudioPipeline() {
 
   // Receive events from the audio pipeline.
   AvPipelineClient av_pipeline_client;
-  av_pipeline_client.eos_cb = ::media::BindToCurrentLoop(
+  av_pipeline_client.eos_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnEosReached, weak_this_, true));
-  av_pipeline_client.playback_error_cb = ::media::BindToCurrentLoop(
+  av_pipeline_client.playback_error_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnError, weak_this_));
-  av_pipeline_client.statistics_cb = ::media::BindToCurrentLoop(
+  av_pipeline_client.statistics_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnStatisticsUpdated, weak_this_));
   audio_pipeline_->SetClient(av_pipeline_client);
 
@@ -293,7 +293,7 @@ void CmaRenderer::InitializeVideoPipeline() {
   DCHECK(!init_cb_.is_null());
 
   ::media::PipelineStatusCB video_initialization_done_cb =
-      ::media::BindToCurrentLoop(
+      base::BindToCurrentLoop(
           base::Bind(&CmaRenderer::OnVideoPipelineInitializeDone, weak_this_));
 
   ::media::DemuxerStream* stream =
@@ -305,13 +305,13 @@ void CmaRenderer::InitializeVideoPipeline() {
 
   // Receive events from the video pipeline.
   VideoPipelineClient client;
-  client.av_pipeline_client.eos_cb = ::media::BindToCurrentLoop(
+  client.av_pipeline_client.eos_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnEosReached, weak_this_, false));
-  client.av_pipeline_client.playback_error_cb = ::media::BindToCurrentLoop(
+  client.av_pipeline_client.playback_error_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnError, weak_this_));
-  client.av_pipeline_client.statistics_cb = ::media::BindToCurrentLoop(
+  client.av_pipeline_client.statistics_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnStatisticsUpdated, weak_this_));
-  client.natural_size_changed_cb = ::media::BindToCurrentLoop(
+  client.natural_size_changed_cb = base::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnNaturalSizeChanged, weak_this_));
   video_pipeline_->SetClient(client);