Index: media/filters/decrypting_demuxer_stream_unittest.cc |
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc |
index 45cdfe118ff7230faf941464e0e5b4e89f7122c0..f08733b22ba1e4394fb83356fc5006b3e2cf48cd 100644 |
--- a/media/filters/decrypting_demuxer_stream_unittest.cc |
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc |
@@ -131,7 +131,7 @@ class DecryptingDemuxerStreamTest : public testing::Test { |
AudioDecoderConfig input_config(kCodecVorbis, kSampleFormatPlanarF32, |
CHANNEL_LAYOUT_STEREO, 44100, |
- EmptyExtraData(), true); |
+ EmptyExtraData(), AesCtrEncryptionScheme()); |
InitializeAudioAndExpectStatus(input_config, PIPELINE_OK); |
const AudioDecoderConfig& output_config = |
@@ -305,7 +305,7 @@ TEST_F(DecryptingDemuxerStreamTest, Initialize_CdmWithoutDecryptor) { |
SetCdmType(CDM_WITHOUT_DECRYPTOR); |
AudioDecoderConfig input_config(kCodecVorbis, kSampleFormatPlanarF32, |
CHANNEL_LAYOUT_STEREO, 44100, |
- EmptyExtraData(), true); |
+ EmptyExtraData(), AesCtrEncryptionScheme()); |
InitializeAudioAndExpectStatus(input_config, DECODER_ERROR_NOT_SUPPORTED); |
} |
@@ -361,7 +361,7 @@ TEST_F(DecryptingDemuxerStreamTest, KeyAdded_DuringWaitingForKey) { |
// Test the case where the a key is added when the decryptor is in |
// kPendingDecrypt state. |
-TEST_F(DecryptingDemuxerStreamTest, KeyAdded_DruingPendingDecrypt) { |
+TEST_F(DecryptingDemuxerStreamTest, KeyAdded_DuringPendingDecrypt) { |
Initialize(); |
EnterPendingDecryptState(); |
@@ -457,7 +457,7 @@ TEST_F(DecryptingDemuxerStreamTest, DemuxerRead_ConfigChanged) { |
AudioDecoderConfig new_config(kCodecVorbis, kSampleFormatPlanarF32, |
CHANNEL_LAYOUT_STEREO, 88200, EmptyExtraData(), |
- true); |
+ AesCtrEncryptionScheme()); |
input_audio_stream_->set_audio_decoder_config(new_config); |
EXPECT_CALL(*input_audio_stream_, Read(_)) |