Index: media/filters/fake_video_decoder.cc |
diff --git a/media/filters/fake_video_decoder.cc b/media/filters/fake_video_decoder.cc |
index 9b9663335352791cd1c4a9ae756beb79eb859c85..91a17b1844d6f5a8b78c0370714bc38980279bae 100644 |
--- a/media/filters/fake_video_decoder.cc |
+++ b/media/filters/fake_video_decoder.cc |
@@ -5,10 +5,10 @@ |
#include "media/filters/fake_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/message_loop/message_loop_proxy.h" |
-#include "media/base/bind_to_current_loop.h" |
#include "media/base/test_helpers.h" |
namespace media { |
@@ -58,10 +58,10 @@ void FakeVideoDecoder::Initialize(const VideoDecoderConfig& config, |
DCHECK(reset_cb_.IsNull()) << "No reinitialization during pending reset."; |
current_config_ = config; |
- init_cb_.SetCallback(BindToCurrentLoop(status_cb)); |
+ init_cb_.SetCallback(base::BindToCurrentLoop(status_cb)); |
- // Don't need BindToCurrentLoop() because |output_cb_| is only called from |
- // RunDecodeCallback() which is posted from Decode(). |
+ // Don't need base::BindToCurrentLoop() because |output_cb_| is only called |
+ // from RunDecodeCallback() which is posted from Decode(). |
output_cb_ = output_cb; |
if (!decoded_frames_.empty()) { |
@@ -92,7 +92,7 @@ void FakeVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer, |
DecodeCB wrapped_decode_cb = base::Bind(&FakeVideoDecoder::OnFrameDecoded, |
weak_factory_.GetWeakPtr(), |
buffer_size, |
- BindToCurrentLoop(decode_cb)); |
+ base::BindToCurrentLoop(decode_cb)); |
if (state_ == STATE_ERROR) { |
wrapped_decode_cb.Run(kDecodeError); |
@@ -115,7 +115,7 @@ void FakeVideoDecoder::Reset(const base::Closure& closure) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
DCHECK(reset_cb_.IsNull()); |
- reset_cb_.SetCallback(BindToCurrentLoop(closure)); |
+ reset_cb_.SetCallback(base::BindToCurrentLoop(closure)); |
decoded_frames_.clear(); |
// Defer the reset if a decode is pending. |