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

media/filters/video_frame_stream_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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/gmock_callback_support.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "media/filters/decoder_stream.h"
 #include "media/filters/fake_demuxer_stream.h"
 #include "media/filters/fake_video_decoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Assign;
+using ::testing::Eq;
 using ::testing::Invoke;
+using ::testing::InvokeWithoutArgs;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::SaveArg;
 
 static const int kNumConfigs = 3;
 static const int kNumBuffersInOneConfig = 5;
 
 namespace media {
 
 struct VideoFrameStreamTestParams {
@@ skipping 54 matching lines @@
     decoder_ = NULL;
     video_frame_stream_.reset();
     message_loop_.RunUntilIdle();
 
     DCHECK(!pending_initialize_);
     DCHECK(!pending_read_);
     DCHECK(!pending_reset_);
     DCHECK(!pending_stop_);
   }
 
+  // Used to verify that the number of calls to SetDecryptorReadyCallback()

[ddorwin, 2014/08/04 18:59:08]

ditto - skipped this file.

Since we now have 3 copies of this, maybe we can add it to
media/base/test_helpers.h. We'd need to rename it (and the comments) to be more
generic. MatchingCallbackVerifier?

[jrummell, 2014/08/07 01:54:25]

Done.

+  // match the number of calls to DecryptorSet() and that the calls happen in
+  // pairs (e.g. DecryptorSet() called after every SetDecryptorReadyCallback()
+  // call). There may be any number of pairs (including 0).
+  class CallbackVerifier {
+   public:
+    CallbackVerifier() : ready_called_(0), set_called_(0) {}
+    ~CallbackVerifier() { Verify(); }
+    void SetDecryptorReadyCallbackCalled() { ++ready_called_; }
+    void DecryptorSetCalled() {
+      ++set_called_;
+      Verify();
+    }
+    void Verify() { EXPECT_EQ(set_called_, ready_called_); }
+
+   private:
+    int ready_called_;
+    int set_called_;
+  };
+
   MOCK_METHOD1(OnNewSpliceBuffer, void(base::TimeDelta));
   MOCK_METHOD1(SetDecryptorReadyCallback, void(const media::DecryptorReadyCB&));
+  MOCK_METHOD1(DecryptorSet, void(bool));
 
   void OnStatistics(const PipelineStatistics& statistics) {
     total_bytes_decoded_ += statistics.video_bytes_decoded;
   }
 
   void OnInitialized(bool success) {
     DCHECK(!pending_read_);
     DCHECK(!pending_reset_);
     DCHECK(pending_initialize_);
     pending_initialize_ = false;
@@ skipping 106 matching lines @@
 
       case SET_DECRYPTOR:
         // Hold DecryptorReadyCB.
         EXPECT_CALL(*this, SetDecryptorReadyCallback(_))
             .Times(2);
         // Initialize will fail because no decryptor is available.
         InitializeVideoFrameStream();
         break;
 
       case DECRYPTOR_NO_KEY:
-        EXPECT_CALL(*this, SetDecryptorReadyCallback(_))
-            .WillRepeatedly(RunCallback<0>(decryptor_.get()));
+        EXPECT_CALL(*this, SetDecryptorReadyCallback(_)).WillRepeatedly(DoAll(
+            InvokeWithoutArgs(
+                &verifier_, &CallbackVerifier::SetDecryptorReadyCallbackCalled),
+            RunCallback<0>(decryptor_.get(),
+                           base::Bind(&VideoFrameStreamTest::DecryptorSet,
+                                      base::Unretained(this)))));
+        EXPECT_CALL(*this, DecryptorSet(Eq(true)))
+            .WillRepeatedly(InvokeWithoutArgs(
+                &verifier_, &CallbackVerifier::DecryptorSetCalled));
         has_no_key_ = true;
         ReadOneFrame();
         break;
 
       case DECODER_INIT:
-        EXPECT_CALL(*this, SetDecryptorReadyCallback(_))
-            .WillRepeatedly(RunCallback<0>(decryptor_.get()));
+        EXPECT_CALL(*this, SetDecryptorReadyCallback(_)).WillRepeatedly(DoAll(
+            InvokeWithoutArgs(
+                &verifier_, &CallbackVerifier::SetDecryptorReadyCallbackCalled),
+            RunCallback<0>(decryptor_.get(),
+                           base::Bind(&VideoFrameStreamTest::DecryptorSet,
+                                      base::Unretained(this)))));
+        EXPECT_CALL(*this, DecryptorSet(Eq(true)))
+            .WillRepeatedly(InvokeWithoutArgs(
+                &verifier_, &CallbackVerifier::DecryptorSetCalled));
         decoder_->HoldNextInit();
         InitializeVideoFrameStream();
         break;
 
       case DECODER_REINIT:
         decoder_->HoldNextInit();
         ReadUntilPending();
         break;
 
       case DECODER_DECODE:
@@ skipping 84 matching lines @@
   bool pending_read_;
   bool pending_reset_;
   bool pending_stop_;
   int total_bytes_decoded_;
   scoped_refptr<VideoFrame> frame_read_;
   VideoFrameStream::Status last_read_status_;
 
   // Decryptor has no key to decrypt a frame.
   bool has_no_key_;
 
+  CallbackVerifier verifier_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoFrameStreamTest);
 };
 
 INSTANTIATE_TEST_CASE_P(
     Clear,
     VideoFrameStreamTest,
     ::testing::Values(
         VideoFrameStreamTestParams(false, 0, 1),
         VideoFrameStreamTestParams(false, 3, 1),
@@ skipping 340 matching lines @@
   // The error must surface from Read() as DECODE_ERROR.
   while (last_read_status_ == VideoFrameStream::OK) {
     ReadOneFrame();
     message_loop_.RunUntilIdle();
     EXPECT_FALSE(pending_read_);
   }
   EXPECT_EQ(VideoFrameStream::DECODE_ERROR, last_read_status_);
 }
 
 }  // namespace media