| Index: media/filters/decrypting_demuxer_stream.cc
|
| diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc
|
| index 7a6f43ce797854d65faf80280956a061fa244efc..60152da0a30c7222438db71fb9a7e080c4f01d98 100644
|
| --- a/media/filters/decrypting_demuxer_stream.cc
|
| +++ b/media/filters/decrypting_demuxer_stream.cc
|
| @@ -5,12 +5,12 @@
|
| #include "media/filters/decrypting_demuxer_stream.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 "media/base/audio_decoder_config.h"
|
| -#include "media/base/bind_to_current_loop.h"
|
| #include "media/base/decoder_buffer.h"
|
| #include "media/base/decryptor.h"
|
| #include "media/base/demuxer_stream.h"
|
| @@ -51,12 +51,12 @@ void DecryptingDemuxerStream::Initialize(DemuxerStream* stream,
|
| DCHECK(!demuxer_stream_);
|
| weak_this_ = weak_factory_.GetWeakPtr();
|
| demuxer_stream_ = stream;
|
| - init_cb_ = BindToCurrentLoop(status_cb);
|
| + init_cb_ = base::BindToCurrentLoop(status_cb);
|
|
|
| InitializeDecoderConfig();
|
|
|
| state_ = kDecryptorRequested;
|
| - set_decryptor_ready_cb_.Run(BindToCurrentLoop(
|
| + set_decryptor_ready_cb_.Run(base::BindToCurrentLoop(
|
| base::Bind(&DecryptingDemuxerStream::SetDecryptor, weak_this_)));
|
| }
|
|
|
| @@ -67,7 +67,7 @@ void DecryptingDemuxerStream::Read(const ReadCB& read_cb) {
|
| DCHECK(!read_cb.is_null());
|
| CHECK(read_cb_.is_null()) << "Overlapping reads are not supported.";
|
|
|
| - read_cb_ = BindToCurrentLoop(read_cb);
|
| + read_cb_ = base::BindToCurrentLoop(read_cb);
|
| state_ = kPendingDemuxerRead;
|
| demuxer_stream_->Read(
|
| base::Bind(&DecryptingDemuxerStream::DecryptBuffer, weak_this_));
|
| @@ -79,7 +79,7 @@ void DecryptingDemuxerStream::Reset(const base::Closure& closure) {
|
| DCHECK(state_ != kUninitialized) << state_;
|
| DCHECK(reset_cb_.is_null());
|
|
|
| - reset_cb_ = BindToCurrentLoop(closure);
|
| + reset_cb_ = base::BindToCurrentLoop(closure);
|
|
|
| // TODO(xhwang): This should not happen. Remove it, DCHECK against the
|
| // condition and clean up related tests.
|
| @@ -190,7 +190,7 @@ void DecryptingDemuxerStream::SetDecryptor(
|
|
|
| decryptor_->RegisterNewKeyCB(
|
| GetDecryptorStreamType(),
|
| - BindToCurrentLoop(
|
| + base::BindToCurrentLoop(
|
| base::Bind(&DecryptingDemuxerStream::OnKeyAdded, weak_this_)));
|
|
|
| state_ = kIdle;
|
| @@ -271,7 +271,7 @@ void DecryptingDemuxerStream::DecryptPendingBuffer() {
|
| decryptor_->Decrypt(
|
| GetDecryptorStreamType(),
|
| pending_buffer_to_decrypt_,
|
| - BindToCurrentLoop(
|
| + base::BindToCurrentLoop(
|
| base::Bind(&DecryptingDemuxerStream::DeliverBuffer, weak_this_)));
|
| }
|
|
|
|
|