media: clang format on decrypting decoders and demuxer streams
Clang-format only. No functionality or code change.
TBR=jrummell@chromium.org
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I7fada73aca62544a47e41401c3812768f3db4f7a
Reviewed-on: https://chromium-review.googlesource.com/1077623
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562992}
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index f68e048a..8a5b4621 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -111,16 +111,14 @@
InitializeAndExpectResult(config_, true);
}
- void Reinitialize() {
- ReinitializeConfigChange(config_);
- }
+ void Reinitialize() { ReinitializeConfigChange(config_); }
void ReinitializeConfigChange(const AudioDecoderConfig& new_config) {
EXPECT_CALL(*decryptor_, DeinitializeDecoder(Decryptor::kAudio));
EXPECT_CALL(*decryptor_, InitializeAudioDecoder(_, _))
.WillOnce(RunCallback<1>(true));
EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kAudio, _))
- .WillOnce(SaveArg<1>(&key_added_cb_));
+ .WillOnce(SaveArg<1>(&key_added_cb_));
decoder_->Initialize(
new_config, cdm_context_.get(), NewExpectedBoolCB(true),
base::Bind(&DecryptingAudioDecoderTest::FrameReady,
@@ -133,9 +131,8 @@
void DecodeAndExpect(scoped_refptr<DecoderBuffer> buffer,
DecodeStatus status) {
EXPECT_CALL(*this, DecodeDone(status));
- decoder_->Decode(buffer,
- base::Bind(&DecryptingAudioDecoderTest::DecodeDone,
- base::Unretained(this)));
+ decoder_->Decode(buffer, base::Bind(&DecryptingAudioDecoderTest::DecodeDone,
+ base::Unretained(this)));
base::RunLoop().RunUntilIdle();
}
@@ -161,8 +158,9 @@
// Sets up expectations and actions to put DecryptingAudioDecoder in an
// active normal decoding state.
void EnterNormalDecodingState() {
- EXPECT_CALL(*decryptor_, DecryptAndDecodeAudio(_, _)).WillRepeatedly(
- Invoke(this, &DecryptingAudioDecoderTest::DecryptAndDecodeAudio));
+ EXPECT_CALL(*decryptor_, DecryptAndDecodeAudio(_, _))
+ .WillRepeatedly(
+ Invoke(this, &DecryptingAudioDecoderTest::DecryptAndDecodeAudio));
EXPECT_CALL(*this, FrameReady(decoded_frame_));
for (int i = 0; i < kDecodingDelay + 1; ++i)
DecodeAndExpect(encrypted_buffer_, DecodeStatus::OK);
@@ -173,8 +171,7 @@
// EnterNormalDecodingState() to work.
void EnterEndOfStreamState() {
// The codec in the |decryptor_| will be flushed.
- EXPECT_CALL(*this, FrameReady(decoded_frame_))
- .Times(kDecodingDelay);
+ EXPECT_CALL(*this, FrameReady(decoded_frame_)).Times(kDecodingDelay);
DecodeAndExpect(DecoderBuffer::CreateEOSBuffer(), DecodeStatus::OK);
EXPECT_EQ(0, num_frames_in_decryptor_);
}
@@ -196,8 +193,8 @@
void EnterWaitingForKeyState() {
EXPECT_CALL(*decryptor_, DecryptAndDecodeAudio(encrypted_buffer_, _))
- .WillRepeatedly(RunCallback<1>(Decryptor::kNoKey,
- Decryptor::AudioFrames()));
+ .WillRepeatedly(
+ RunCallback<1>(Decryptor::kNoKey, Decryptor::AudioFrames()));
EXPECT_CALL(*this, OnWaitingForDecryptionKey());
decoder_->Decode(encrypted_buffer_,
base::Bind(&DecryptingAudioDecoderTest::DecodeDone,
@@ -208,8 +205,8 @@
void AbortPendingAudioDecodeCB() {
if (!pending_audio_decode_cb_.is_null()) {
- base::ResetAndReturn(&pending_audio_decode_cb_).Run(
- Decryptor::kSuccess, Decryptor::AudioFrames());
+ base::ResetAndReturn(&pending_audio_decode_cb_)
+ .Run(Decryptor::kSuccess, Decryptor::AudioFrames());
}
}
@@ -315,8 +312,8 @@
Initialize();
EXPECT_CALL(*decryptor_, DecryptAndDecodeAudio(_, _))
- .WillRepeatedly(RunCallback<1>(Decryptor::kError,
- Decryptor::AudioFrames()));
+ .WillRepeatedly(
+ RunCallback<1>(Decryptor::kError, Decryptor::AudioFrames()));
DecodeAndExpect(encrypted_buffer_, DecodeStatus::DECODE_ERROR);
}
@@ -423,8 +420,8 @@
// The audio decode callback is returned after the correct decryption key is
// added.
key_added_cb_.Run();
- base::ResetAndReturn(&pending_audio_decode_cb_).Run(
- Decryptor::kNoKey, Decryptor::AudioFrames());
+ base::ResetAndReturn(&pending_audio_decode_cb_)
+ .Run(Decryptor::kNoKey, Decryptor::AudioFrames());
base::RunLoop().RunUntilIdle();
}