media: Allow config change between clear and encrypted streams

media/filters/decrypting_demuxer_stream_unittest.cc

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 d13aec42f0a17f8bb10df53acae7d9f06833b123..e6a57e2dc27402b5dd83f0113cf82dc408e43faf 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -72,7 +72,8 @@ class DecryptingDemuxerStreamTest : public testing::Test {
             new StrictMock<MockDemuxerStream>(DemuxerStream::AUDIO)),
         input_video_stream_(
             new StrictMock<MockDemuxerStream>(DemuxerStream::VIDEO)),
-        clear_buffer_(CreateFakeEncryptedStreamBuffer(true)),
+        clear_buffer_(new DecoderBuffer(kFakeBufferSize)),
+        clear_encrypted_stream_buffer_(CreateFakeEncryptedStreamBuffer(true)),
         encrypted_buffer_(CreateFakeEncryptedStreamBuffer(false)),
         decrypted_buffer_(new DecoderBuffer(kFakeBufferSize)) {}
 
@@ -158,10 +159,12 @@ class DecryptingDemuxerStreamTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
   }
 
-  void EnterClearReadingState() {
-    EXPECT_TRUE(clear_buffer_->decrypt_config());
+  void EnterClearReadingState(bool is_stream_encrytped) {
+    EXPECT_TRUE(clear_encrypted_stream_buffer_->decrypt_config());
     EXPECT_CALL(*input_audio_stream_, Read(_))
-        .WillOnce(ReturnBuffer(clear_buffer_));
+        .WillOnce(ReturnBuffer(is_stream_encrytped
+                                   ? clear_encrypted_stream_buffer_
+                                   : clear_buffer_));
 
     // For clearbuffer, decryptor->Decrypt() will not be called.
 
@@ -266,6 +269,7 @@ class DecryptingDemuxerStreamTest : public testing::Test {
   // Constant buffers to be returned by the input demuxer streams and the
   // |decryptor_|.
   scoped_refptr<DecoderBuffer> clear_buffer_;
+  scoped_refptr<DecoderBuffer> clear_encrypted_stream_buffer_;
   scoped_refptr<DecoderBuffer> encrypted_buffer_;
   scoped_refptr<DecoderBuffer> decrypted_buffer_;
 
@@ -313,9 +317,17 @@ TEST_F(DecryptingDemuxerStreamTest, Read_Normal) {
 }
 
 // Test normal read case where the buffer is clear.
-TEST_F(DecryptingDemuxerStreamTest, Read_Clear) {
+// TODO(xhwang): Unify clear buffer handling in clear and encrypted stream.

[ddorwin, 2017/02/12 04:28:52]

How is this relevant here? Will that eliminate one of these?

[xhwang, 2017/02/14 23:59:33]

Yeah, the clear buffer from encrypted stream and clear stream should be the
same. Hence we only need one test here.

+// See http://crbug.com/675003
+
+TEST_F(DecryptingDemuxerStreamTest, Read_ClearBufferInEncryptedStream) {
+  Initialize();
+  EnterClearReadingState(true);
+}
+
+TEST_F(DecryptingDemuxerStreamTest, Read_ClearBufferInClearStream) {
   Initialize();
-  EnterClearReadingState();
+  EnterClearReadingState(false);
 }
 
 // Test the case where the decryptor returns error during read.