Move BindToCurrentLoop from media/base/ to base/

chromecast/browser/media/cma_message_filter_host.cc

Index: chromecast/browser/media/cma_message_filter_host.cc
diff --git a/chromecast/browser/media/cma_message_filter_host.cc b/chromecast/browser/media/cma_message_filter_host.cc
index 899b9ef43f4ba56a855bc638d08320a0d537111a..32738c75029dcca293f9c52b30ca4503e431d481 100644
--- a/chromecast/browser/media/cma_message_filter_host.cc
+++ b/chromecast/browser/media/cma_message_filter_host.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/bind_to_current_loop.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
@@ -20,7 +21,6 @@
 #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
-#include "media/base/bind_to_current_loop.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/size.h"
@@ -210,11 +210,11 @@ void CmaMessageFilterHost::CreateMedia(int media_id, LoadType load_type) {
 
   scoped_ptr<MediaPipelineHost> media_pipeline_host(new MediaPipelineHost());
   MediaPipelineClient client;
-  client.time_update_cb = ::media::BindToCurrentLoop(base::Bind(
+  client.time_update_cb = base::BindToCurrentLoop(base::Bind(
       &CmaMessageFilterHost::OnTimeUpdate, weak_this_, media_id));
-  client.buffering_state_cb = ::media::BindToCurrentLoop(base::Bind(
+  client.buffering_state_cb = base::BindToCurrentLoop(base::Bind(
       &CmaMessageFilterHost::OnBufferingNotification, weak_this_, media_id));
-  client.error_cb = ::media::BindToCurrentLoop(
+  client.error_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnPlaybackError,
                  weak_this_, media_id, media::kNoTrackId));
   task_runner_->PostTask(
@@ -312,10 +312,10 @@ void CmaMessageFilterHost::CreateAvPipe(
   // TODO(erickung): investigate possible memory leak here.
   // If the weak pointer in |av_pipe_set_cb| gets invalidated,
   // then |foreign_memory_handle| leaks.
-  base::Closure pipe_read_activity_cb = ::media::BindToCurrentLoop(
+  base::Closure pipe_read_activity_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnPipeReadActivity, weak_this_,
                  media_id, track_id));
-  base::Closure av_pipe_set_cb = ::media::BindToCurrentLoop(
+  base::Closure av_pipe_set_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnAvPipeSet, weak_this_,
                  media_id, track_id,
                  foreign_memory_handle, base::Passed(&foreign_socket)));
@@ -355,15 +355,15 @@ void CmaMessageFilterHost::AudioInitialize(
   }
 
   AvPipelineClient client;
-  client.eos_cb = ::media::BindToCurrentLoop(base::Bind(
+  client.eos_cb = base::BindToCurrentLoop(base::Bind(
       &CmaMessageFilterHost::OnEos, weak_this_, media_id, track_id));
-  client.playback_error_cb = ::media::BindToCurrentLoop(base::Bind(
+  client.playback_error_cb = base::BindToCurrentLoop(base::Bind(
       &CmaMessageFilterHost::OnPlaybackError, weak_this_, media_id, track_id));
-  client.statistics_cb = ::media::BindToCurrentLoop(
+  client.statistics_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnStatisticsUpdated, weak_this_,
                  media_id, track_id));
 
-  ::media::PipelineStatusCB pipeline_status_cb = ::media::BindToCurrentLoop(
+  ::media::PipelineStatusCB pipeline_status_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnTrackStateChanged, weak_this_,
                  media_id, track_id));
   task_runner_->PostTask(
@@ -384,20 +384,20 @@ void CmaMessageFilterHost::VideoInitialize(
   }
 
   VideoPipelineClient client;
-  client.av_pipeline_client.eos_cb = ::media::BindToCurrentLoop(
+  client.av_pipeline_client.eos_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnEos, weak_this_,
                  media_id, track_id));
-  client.av_pipeline_client.playback_error_cb = ::media::BindToCurrentLoop(
+  client.av_pipeline_client.playback_error_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnPlaybackError, weak_this_,
                  media_id, track_id));
-  client.av_pipeline_client.statistics_cb = ::media::BindToCurrentLoop(
+  client.av_pipeline_client.statistics_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnStatisticsUpdated, weak_this_,
                  media_id, track_id));
-  client.natural_size_changed_cb = ::media::BindToCurrentLoop(
+  client.natural_size_changed_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnNaturalSizeChanged, weak_this_,
                  media_id, track_id));
 
-  ::media::PipelineStatusCB pipeline_status_cb = ::media::BindToCurrentLoop(
+  ::media::PipelineStatusCB pipeline_status_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnTrackStateChanged, weak_this_,
                  media_id, track_id));
   task_runner_->PostTask(
@@ -424,7 +424,7 @@ void CmaMessageFilterHost::Flush(int media_id) {
         media_id, ::media::PIPELINE_ERROR_ABORT));
     return;
   }
-  ::media::PipelineStatusCB pipeline_status_cb = ::media::BindToCurrentLoop(
+  ::media::PipelineStatusCB pipeline_status_cb = base::BindToCurrentLoop(
       base::Bind(&CmaMessageFilterHost::OnMediaStateChanged, weak_this_,
                  media_id));
   FORWARD_CALL(media_pipeline, Flush, pipeline_status_cb);