Replace base::Bind with BindOnce/BindRepeating in media/filters.
Bug: 1007805
Change-Id: I8e0136335d880ce1897d75e70a81dddd2e016d80
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2522397
Reviewed-by: John Rummell <jrummell@chromium.org>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826515}
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index 7772462..b88ec863 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -83,16 +83,17 @@
kNoTimestamp);
decoded_frame_list_.push_back(decoded_frame_);
- decoder_->Initialize(config, cdm_context_.get(),
- base::BindOnce(
- [](bool success, Status status) {
- EXPECT_EQ(status.is_ok(), success);
- },
- success),
- base::Bind(&DecryptingAudioDecoderTest::FrameReady,
- base::Unretained(this)),
- base::Bind(&DecryptingAudioDecoderTest::OnWaiting,
- base::Unretained(this)));
+ decoder_->Initialize(
+ config, cdm_context_.get(),
+ base::BindOnce(
+ [](bool success, Status status) {
+ EXPECT_EQ(status.is_ok(), success);
+ },
+ success),
+ base::BindRepeating(&DecryptingAudioDecoderTest::FrameReady,
+ base::Unretained(this)),
+ base::BindRepeating(&DecryptingAudioDecoderTest::OnWaiting,
+ base::Unretained(this)));
base::RunLoop().RunUntilIdle();
}
@@ -129,17 +130,18 @@
decoder_->Initialize(
new_config, cdm_context_.get(),
base::BindOnce([](Status status) { EXPECT_TRUE(status.is_ok()); }),
- base::Bind(&DecryptingAudioDecoderTest::FrameReady,
- base::Unretained(this)),
- base::Bind(&DecryptingAudioDecoderTest::OnWaiting,
- base::Unretained(this)));
+ base::BindRepeating(&DecryptingAudioDecoderTest::FrameReady,
+ base::Unretained(this)),
+ base::BindRepeating(&DecryptingAudioDecoderTest::OnWaiting,
+ base::Unretained(this)));
}
// Decode |buffer| and expect DecodeDone to get called with |status|.
void DecodeAndExpect(scoped_refptr<DecoderBuffer> buffer, StatusCode status) {
EXPECT_CALL(*this, DecodeDone(HasStatusCode(status)));
- decoder_->Decode(buffer, base::Bind(&DecryptingAudioDecoderTest::DecodeDone,
- base::Unretained(this)));
+ decoder_->Decode(buffer,
+ base::BindOnce(&DecryptingAudioDecoderTest::DecodeDone,
+ base::Unretained(this)));
base::RunLoop().RunUntilIdle();
}
@@ -190,8 +192,8 @@
.WillOnce(SaveArg<1>(&pending_audio_decode_cb_));
decoder_->Decode(encrypted_buffer_,
- base::Bind(&DecryptingAudioDecoderTest::DecodeDone,
- base::Unretained(this)));
+ base::BindOnce(&DecryptingAudioDecoderTest::DecodeDone,
+ base::Unretained(this)));
base::RunLoop().RunUntilIdle();
// Make sure the Decode() on the decoder triggers a DecryptAndDecode() on
// the decryptor.
@@ -204,8 +206,8 @@
RunCallback<1>(Decryptor::kNoKey, Decryptor::AudioFrames()));
EXPECT_CALL(*this, OnWaiting(WaitingReason::kNoDecryptionKey));
decoder_->Decode(encrypted_buffer_,
- base::Bind(&DecryptingAudioDecoderTest::DecodeDone,
- base::Unretained(this)));
+ base::BindOnce(&DecryptingAudioDecoderTest::DecodeDone,
+ base::Unretained(this)));
base::RunLoop().RunUntilIdle();
}