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

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 57760b5e065439d48cceec13a57eff5ff4236df1..e96f7f1e8db03a6ec4598b455dca8f400e9d5fa9 100644
--- a/media/filters/video_decoder_selector_unittest.cc
+++ b/media/filters/video_decoder_selector_unittest.cc
@@ -14,12 +14,30 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
+using ::testing::Eq;
+using ::testing::InvokeWithoutArgs;

[ddorwin, 2014/08/07 19:52:04]

unused

[jrummell, 2014/08/08 20:58:28]

Done.

 using ::testing::IsNull;
 using ::testing::NiceMock;
 using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::StrictMock;
 
+// 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_P3(CallDecryptorReadyWithVerifier, decryptor, done_cb, verifier) {

[ddorwin, 2014/08/07 19:52:04]

ditto on naming

[jrummell, 2014/08/08 20:58:29]

Done.

+  // verifier must be called first since |done_cb| call will trigger it as well.
+  verifier->A();
+  arg0.Run(decryptor, done_cb);
+}
+
+ACTION_P(VerifyCallbackHappened, verifier) {
+  verifier->B();
+}
+
+}  // namespace
+
 namespace media {
 
 class VideoDecoderSelectorTest : public ::testing::Test {
@@ -51,6 +69,7 @@ class VideoDecoderSelectorTest : public ::testing::Test {
   MOCK_METHOD1(SetDecryptorReadyCallback, void(const media::DecryptorReadyCB&));
   MOCK_METHOD2(OnDecoderSelected,
                void(VideoDecoder*, DecryptingDemuxerStream*));
+  MOCK_METHOD1(DecryptorSet, void(bool));
 
   void MockOnDecoderSelected(
       scoped_ptr<VideoDecoder> decoder,
@@ -80,7 +99,13 @@ class VideoDecoderSelectorTest : public ::testing::Test {
     if (decryptor_capability == kDecryptOnly ||
         decryptor_capability == kDecryptAndDecode) {
       EXPECT_CALL(*this, SetDecryptorReadyCallback(_))
-          .WillRepeatedly(RunCallback<0>(decryptor_.get()));
+          .WillRepeatedly(CallDecryptorReadyWithVerifier(
+              decryptor_.get(),
+              base::Bind(&VideoDecoderSelectorTest::DecryptorSet,
+                         base::Unretained(this)),
+              &verifier_));
+      EXPECT_CALL(*this, DecryptorSet(Eq(true)))
+          .WillRepeatedly(VerifyCallbackHappened(&verifier_));
 
       if (decryptor_capability == kDecryptOnly) {
         EXPECT_CALL(*decryptor_, InitializeVideoDecoder(_, _))
@@ -145,6 +170,8 @@ class VideoDecoderSelectorTest : public ::testing::Test {
 
   base::MessageLoop message_loop_;
 
+  MatchingCallbackVerifier verifier_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderSelectorTest);
 };