Move BindToCurrentLoop from media/base/ to base/

content/renderer/media/media_stream_video_capturer_source.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_video_capturer_source.h"
 
 #include "base/bind.h"
+#include "base/bind_to_current_loop.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/render_thread_impl.h"
-#include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
 
 namespace {
 
 // Resolutions used if the source doesn't support capability enumeration.
 struct {
   int width;
   int height;
 } const kVideoResolutions[] = {{1920, 1080},
                                {1280, 720},
@@ skipping 65 matching lines @@
   if (!RenderThreadImpl::current())
     return;
   VideoCaptureImplManager* const manager =
       RenderThreadImpl::current()->video_capture_impl_manager();
   if (!manager)
     return;
   DCHECK(source_formats_callback_.is_null());
   source_formats_callback_ = callback;
   manager->GetDeviceFormatsInUse(
       session_id_,
-      media::BindToCurrentLoop(
+      base::BindToCurrentLoop(
           base::Bind(
               &VideoCapturerDelegate::OnDeviceFormatsInUseReceived,
               weak_factory_.GetWeakPtr())));
 }
 
 void VideoCapturerDelegate::StartCapture(
     const media::VideoCaptureParams& params,
     const VideoCaptureDeliverFrameCB& new_frame_callback,
     scoped_refptr<base::SingleThreadTaskRunner> frame_callback_task_runner,
     const RunningCallback& running_callback) {
@@ skipping 12 matching lines @@
       RenderThreadImpl::current()->GetIOMessageLoopProxy()) {
     DCHECK(false) << "Only IO thread supported right now.";
     running_callback.Run(false);
     return;
   }
 
   stop_capture_cb_ =
       manager->StartCapture(
           session_id_,
     params,
-    media::BindToCurrentLoop(base::Bind(
+    base::BindToCurrentLoop(base::Bind(
               &VideoCapturerDelegate::OnStateUpdate,
         weak_factory_.GetWeakPtr())),
           new_frame_callback);
 }
 
 void VideoCapturerDelegate::StopCapture() {
   // Immediately make sure we don't provide more frames.
   DVLOG(3) << "VideoCapturerDelegate::StopCapture()";
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!stop_capture_cb_.is_null()) {
@@ skipping 35 matching lines @@
   // NULL in unit test.
   if (!RenderThreadImpl::current())
     return;
   VideoCaptureImplManager* const manager =
       RenderThreadImpl::current()->video_capture_impl_manager();
   if (!manager)
     return;
 
   manager->GetDeviceSupportedFormats(
       session_id_,
-      media::BindToCurrentLoop(
+      base::BindToCurrentLoop(
           base::Bind(
               &VideoCapturerDelegate::OnDeviceSupportedFormatsEnumerated,
               weak_factory_.GetWeakPtr())));
 }
 
 void VideoCapturerDelegate::OnDeviceSupportedFormatsEnumerated(
     const media::VideoCaptureFormats& formats) {
   DVLOG(3) << "OnDeviceSupportedFormatsEnumerated: " << formats.size()
            << " received";
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 68 matching lines @@
 
 void MediaStreamVideoCapturerSource::StopSourceImpl() {
   delegate_->StopCapture();
 }
 
 void MediaStreamVideoCapturerSource::OnStarted(bool result) {
   OnStartDone(result ? MEDIA_DEVICE_OK : MEDIA_DEVICE_TRACK_START_FAILURE);
 }
 
 }  // namespace content