Decryptors can report kNoKey to WebMediaPlayer

media/filters/video_decoder_selector_unittest.cc

Index: media/filters/video_decoder_selector_unittest.cc
diff --git a/media/filters/video_decoder_selector_unittest.cc b/media/filters/video_decoder_selector_unittest.cc
index f2dabdf8d17101fb292342b6951067126cddbd1b..2129da75fa35ce66534b9cd00a9a0b06b7b599c7 100644
--- a/media/filters/video_decoder_selector_unittest.cc
+++ b/media/filters/video_decoder_selector_unittest.cc
@@ -131,7 +131,8 @@ class VideoDecoderSelectorTest : public ::testing::Test {
         base::Bind(&VideoDecoderSelectorTest::MockOnDecoderSelected,
                    base::Unretained(this)),
         base::Bind(&VideoDecoderSelectorTest::FrameReady,
-                   base::Unretained(this)));
+                   base::Unretained(this)),
+        base::Closure());
     message_loop_.RunUntilIdle();
   }
 
@@ -187,7 +188,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {
   UseClearStream();
   InitializeDecoderSelector(kNoDecryptor, 1);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(PIPELINE_OK));
   EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
 
@@ -199,7 +200,7 @@ TEST_F(VideoDecoderSelectorTest,
   UseClearStream();
   InitializeDecoderSelector(kNoDecryptor, 1);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _));
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _));
 
   SelectDecoderAndDestroy();
 }
@@ -210,9 +211,9 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {
   UseClearStream();
   InitializeDecoderSelector(kNoDecryptor, 2);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));
-  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(PIPELINE_OK));
   EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
 
@@ -224,9 +225,9 @@ TEST_F(VideoDecoderSelectorTest,
   UseClearStream();
   InitializeDecoderSelector(kNoDecryptor, 2);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));
-  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _));
+  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _, _));
 
   SelectDecoderAndDestroy();
 }
@@ -237,7 +238,7 @@ TEST_F(VideoDecoderSelectorTest, ClearStream_HasDecryptor) {
   UseClearStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(PIPELINE_OK));
   EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
 
@@ -248,7 +249,7 @@ TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_HasDecryptor) {
   UseClearStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _));
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _));
 
   SelectDecoderAndDestroy();
 }
@@ -288,7 +289,7 @@ TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptOnly_OneClearDecoder) {
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(PIPELINE_OK));
   EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));
 
@@ -300,7 +301,7 @@ TEST_F(VideoDecoderSelectorTest,
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _));
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _));
 
   SelectDecoderAndDestroy();
 }
@@ -313,9 +314,9 @@ TEST_F(VideoDecoderSelectorTest,
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 2);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));
-  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(PIPELINE_OK));
   EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, NotNull()));
 
@@ -327,9 +328,9 @@ TEST_F(VideoDecoderSelectorTest,
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 2);
 
-  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _))
+  EXPECT_CALL(*decoder_1_, Initialize(_, _, _, _, _))
       .WillOnce(RunCallback<2>(DECODER_ERROR_NOT_SUPPORTED));
-  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _));
+  EXPECT_CALL(*decoder_2_, Initialize(_, _, _, _, _));
 
   SelectDecoderAndDestroy();
 }