Move BindToCurrentLoop from media/base/ to base/

media/filters/decrypting_video_decoder.cc

Index: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index d9bba50331a1532129ce9d50c178980af3115a38..faeb1b7c63f075e21233437bc16036542b3ad0f0 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -5,12 +5,12 @@
 #include "media/filters/decrypting_video_decoder.h"
 
 #include "base/bind.h"
+#include "base/bind_to_current_loop.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/trace_event/trace_event.h"
-#include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor.h"
 #include "media/base/pipeline.h"
@@ -53,14 +53,14 @@ void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config,
   DCHECK(config.IsValidConfig());
   DCHECK(config.is_encrypted());
 
-  init_cb_ = BindToCurrentLoop(status_cb);
-  output_cb_ = BindToCurrentLoop(output_cb);
+  init_cb_ = base::BindToCurrentLoop(status_cb);
+  output_cb_ = base::BindToCurrentLoop(output_cb);
   weak_this_ = weak_factory_.GetWeakPtr();
   config_ = config;
 
   if (state_ == kUninitialized) {
     state_ = kDecryptorRequested;
-    set_decryptor_ready_cb_.Run(BindToCurrentLoop(base::Bind(
+    set_decryptor_ready_cb_.Run(base::BindToCurrentLoop(base::Bind(
         &DecryptingVideoDecoder::SetDecryptor, weak_this_)));
     return;
   }
@@ -68,7 +68,7 @@ void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config,
   // Reinitialization.
   decryptor_->DeinitializeDecoder(Decryptor::kVideo);
   state_ = kPendingDecoderInit;
-  decryptor_->InitializeVideoDecoder(config, BindToCurrentLoop(base::Bind(
+  decryptor_->InitializeVideoDecoder(config, base::BindToCurrentLoop(base::Bind(
       &DecryptingVideoDecoder::FinishInitialization, weak_this_)));
 }
 
@@ -82,7 +82,7 @@ void DecryptingVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
   DCHECK(!decode_cb.is_null());
   CHECK(decode_cb_.is_null()) << "Overlapping decodes are not supported.";
 
-  decode_cb_ = BindToCurrentLoop(decode_cb);
+  decode_cb_ = base::BindToCurrentLoop(decode_cb);
 
   if (state_ == kError) {
     base::ResetAndReturn(&decode_cb_).Run(kDecodeError);
@@ -111,7 +111,7 @@ void DecryptingVideoDecoder::Reset(const base::Closure& closure) {
   DCHECK(init_cb_.is_null());  // No Reset() during pending initialization.
   DCHECK(reset_cb_.is_null());
 
-  reset_cb_ = BindToCurrentLoop(closure);
+  reset_cb_ = base::BindToCurrentLoop(closure);
 
   decryptor_->ResetDecoder(Decryptor::kVideo);
 
@@ -177,7 +177,7 @@ void DecryptingVideoDecoder::SetDecryptor(
   state_ = kPendingDecoderInit;
   decryptor_->InitializeVideoDecoder(
       config_,
-      BindToCurrentLoop(base::Bind(
+      base::BindToCurrentLoop(base::Bind(
           &DecryptingVideoDecoder::FinishInitialization, weak_this_)));
   decryptor_attached_cb.Run(true);
 }
@@ -199,7 +199,7 @@ void DecryptingVideoDecoder::FinishInitialization(bool success) {
 
   decryptor_->RegisterNewKeyCB(
       Decryptor::kVideo,
-      BindToCurrentLoop(
+      base::BindToCurrentLoop(
           base::Bind(&DecryptingVideoDecoder::OnKeyAdded, weak_this_)));
 
   // Success!
@@ -220,7 +220,7 @@ void DecryptingVideoDecoder::DecodePendingBuffer() {
   }
 
   decryptor_->DecryptAndDecodeVideo(
-      pending_buffer_to_decode_, BindToCurrentLoop(base::Bind(
+      pending_buffer_to_decode_, base::BindToCurrentLoop(base::Bind(
           &DecryptingVideoDecoder::DeliverFrame, weak_this_, buffer_size)));
 }