media: Allow config change between clear and encrypted streams

media/filters/decrypting_audio_decoder_unittest.cc

Index: media/filters/decrypting_audio_decoder_unittest.cc
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index bd12003503fb6eddf0ea896d095d277ced33f959..80a0e2074ec6da5de6f00014485dc2d5e612cefc 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -281,15 +281,6 @@ TEST_F(DecryptingAudioDecoderTest, Initialize_Normal) {
   Initialize();
 }
 
-// Ensure that DecryptingAudioDecoder only accepts encrypted audio.
-TEST_F(DecryptingAudioDecoderTest, Initialize_UnencryptedAudioConfig) {
-  AudioDecoderConfig config(kCodecVorbis, kSampleFormatPlanarF32,
-                            CHANNEL_LAYOUT_STEREO, kSampleRate,
-                            EmptyExtraData(), Unencrypted());
-
-  InitializeAndExpectResult(config, false);
-}
-
 // Ensure decoder handles invalid audio configs without crashing.
 TEST_F(DecryptingAudioDecoderTest, Initialize_InvalidAudioConfig) {
   AudioDecoderConfig config(kUnknownAudioCodec, kUnknownSampleFormat,
@@ -368,6 +359,8 @@ TEST_F(DecryptingAudioDecoderTest, DecryptAndDecode_EndOfStream) {
   EnterEndOfStreamState();
 }
 
+// TODO(xhwang): Add a test for switching from encrypted to clear.

[ddorwin, 2016/12/05 23:53:04]

Can we at least keep the previous test (but expect true) and have a TODO to
improve it?

[xhwang, 2016/12/16 20:12:28]

Due to the new DCHECK the previous test would crash. There are some trivial
differences b/w DAD and DVD and this is one of them. I planned to fix it but
it's always low priority. See the original TODO here:

https://cs.chromium.org/chromium/src/media/filters/decrypting_audio_decoder.c...

+
 // Test reinitializing decode with a new config
 TEST_F(DecryptingAudioDecoderTest, Reinitialize_ConfigChange) {
   Initialize();