Allow setContentDecryptionModule() to get called when setting is done.

media/filters/decrypting_video_decoder_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 26 matching lines @@
                   arraysize(kFakeKeyId)),
       std::string(reinterpret_cast<const char*>(kFakeIv), arraysize(kFakeIv)),
       std::vector<SubsampleEntry>())));
   return buffer;
 }
 
 // Use anonymous namespace here to prevent the actions to be defined multiple
 // times across multiple test files. Sadly we can't use static for them.
 namespace {
 
-ACTION_P(RunCallbackIfNotNull, param) {
-  if (!arg0.is_null())
-    arg0.Run(param);
-}
-
-ACTION_P2(ResetAndRunCallback, callback, param) {
-  base::ResetAndReturn(callback).Run(param);
+ACTION_P3(ResetAndRunCallback, callback, p1, p2) {
+  base::ResetAndReturn(callback).Run(p1, p2);
 }
 
 }  // namespace
 
 class DecryptingVideoDecoderTest : public testing::Test {
  public:
   DecryptingVideoDecoderTest()
       : decoder_(new DecryptingVideoDecoder(
             message_loop_.message_loop_proxy(),
             base::Bind(
                 &DecryptingVideoDecoderTest::RequestDecryptorNotification,
                 base::Unretained(this)))),
         decryptor_(new StrictMock<MockDecryptor>()),
         num_decrypt_and_decode_calls_(0),
         num_frames_in_decryptor_(0),
         encrypted_buffer_(CreateFakeEncryptedBuffer()),
         decoded_video_frame_(VideoFrame::CreateBlackFrame(
             TestVideoConfig::NormalCodedSize())),
         null_video_frame_(scoped_refptr<VideoFrame>()) {
-    EXPECT_CALL(*this, RequestDecryptorNotification(_))
-        .WillRepeatedly(RunCallbackIfNotNull(decryptor_.get()));
   }
 
   virtual ~DecryptingVideoDecoderTest() {
     Destroy();
   }
 
+  void ExpectDecryptorNotification(Decryptor* decryptor, bool expected_result) {
+    EXPECT_CALL(*this, RequestDecryptorNotification(_)).WillOnce(
+        RunCallback<0>(decryptor,
+                       base::Bind(&DecryptingVideoDecoderTest::DecryptorSet,
+                                  base::Unretained(this))));
+    EXPECT_CALL(*this, DecryptorSet(expected_result));
+  }
+
   // Initializes the |decoder_| and expects |status|. Note the initialization
   // can succeed or fail.
   void InitializeAndExpectStatus(const VideoDecoderConfig& config,
                                  PipelineStatus status) {
     decoder_->Initialize(config, false, NewExpectedStatusCB(status),
                          base::Bind(&DecryptingVideoDecoderTest::FrameReady,
                                     base::Unretained(this)));
     message_loop_.RunUntilIdle();
   }
 
   // Initialize the |decoder_| and expects it to succeed.
   void Initialize() {
+    ExpectDecryptorNotification(decryptor_.get(), true);
     EXPECT_CALL(*decryptor_, InitializeVideoDecoder(_, _))
         .WillOnce(RunCallback<1>(true));
     EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kVideo, _))
         .WillOnce(SaveArg<1>(&key_added_cb_));
 
     InitializeAndExpectStatus(TestVideoConfig::NormalEncrypted(), PIPELINE_OK);
   }
 
   // Reinitialize the |decoder_| and expects it to succeed.
   void Reinitialize() {
@@ skipping 113 matching lines @@
 
     decoder_.reset();
     message_loop_.RunUntilIdle();
   }
 
   MOCK_METHOD1(RequestDecryptorNotification, void(const DecryptorReadyCB&));
 
   MOCK_METHOD1(FrameReady, void(const scoped_refptr<VideoFrame>&));
   MOCK_METHOD1(DecodeDone, void(VideoDecoder::Status));
 
+  MOCK_METHOD1(DecryptorSet, void(bool));
+
   base::MessageLoop message_loop_;
   scoped_ptr<DecryptingVideoDecoder> decoder_;
   scoped_ptr<StrictMock<MockDecryptor> > decryptor_;
 
   // Variables to help the |decryptor_| to simulate decoding delay and flushing.
   int num_decrypt_and_decode_calls_;
   int num_frames_in_decryptor_;
 
   Decryptor::DecoderInitCB pending_init_cb_;
   Decryptor::NewKeyCB key_added_cb_;
   Decryptor::VideoDecodeCB pending_video_decode_cb_;
 
   // Constant buffer/frames.
   scoped_refptr<DecoderBuffer> encrypted_buffer_;
   scoped_refptr<VideoFrame> decoded_video_frame_;
   scoped_refptr<VideoFrame> null_video_frame_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoderTest);
 };
 
 TEST_F(DecryptingVideoDecoderTest, Initialize_Normal) {
   Initialize();
 }
 
 TEST_F(DecryptingVideoDecoderTest, Initialize_NullDecryptor) {
-  EXPECT_CALL(*this, RequestDecryptorNotification(_))
-      .WillRepeatedly(RunCallbackIfNotNull(static_cast<Decryptor*>(NULL)));
+  ExpectDecryptorNotification(NULL, false);
   InitializeAndExpectStatus(TestVideoConfig::NormalEncrypted(),
                             DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(DecryptingVideoDecoderTest, Initialize_Failure) {
   EXPECT_CALL(*decryptor_, InitializeVideoDecoder(_, _))
       .WillRepeatedly(RunCallback<1>(false));
   EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kVideo, _))
       .WillRepeatedly(SaveArg<1>(&key_added_cb_));
 
@@ skipping 144 matching lines @@
                        false,
                        NewExpectedStatusCB(DECODER_ERROR_NOT_SUPPORTED),
                        base::Bind(&DecryptingVideoDecoderTest::FrameReady,
                                   base::Unretained(this)));
   message_loop_.RunUntilIdle();
   // |decryptor_ready_cb| is saved but not called here.
   EXPECT_FALSE(decryptor_ready_cb.is_null());
 
   // During destruction, RequestDecryptorNotification() should be called with a
   // NULL callback to cancel the |decryptor_ready_cb|.
-  EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback()))
-      .WillOnce(ResetAndRunCallback(&decryptor_ready_cb,
-                                    reinterpret_cast<Decryptor*>(NULL)));
+  EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce(
+      ResetAndRunCallback(&decryptor_ready_cb,
+                          reinterpret_cast<Decryptor*>(NULL),
+                          base::Bind(&DecryptingVideoDecoderTest::DecryptorSet,
+                                     base::Unretained(this))));
+  EXPECT_CALL(*this, DecryptorSet(_)).Times(0);
   Destroy();
 }
 
 // Test destruction when the decoder is in kPendingDecoderInit state.
 TEST_F(DecryptingVideoDecoderTest, Destroy_DuringPendingDecoderInit) {
+  ExpectDecryptorNotification(decryptor_.get(), true);
   EXPECT_CALL(*decryptor_, InitializeVideoDecoder(_, _))
       .WillOnce(SaveArg<1>(&pending_init_cb_));
 
   InitializeAndExpectStatus(TestVideoConfig::NormalEncrypted(),
                             DECODER_ERROR_NOT_SUPPORTED);
   EXPECT_FALSE(pending_init_cb_.is_null());
 
   Destroy();
 }
 
@@ skipping 57 matching lines @@
 
 // Test destruction after the decoder has been reset.
 TEST_F(DecryptingVideoDecoderTest, Destroy_AfterReset) {
   Initialize();
   EnterNormalDecodingState();
   Reset();
   Destroy();
 }
 
 }  // namespace media