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..04186db02ea114297155668197241ec4645229dd 100644 |
--- a/media/filters/video_decoder_selector_unittest.cc |
+++ b/media/filters/video_decoder_selector_unittest.cc |
@@ -14,12 +14,29 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
using ::testing::_; |
+using ::testing::Eq; |
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(ExecuteCallbackWithVerifier, decryptor, done_cb, verifier) { |
+ // verifier must be called first since |done_cb| call will invoke it as well. |
+ verifier->A(); |
+ arg0.Run(decryptor, done_cb); |
+} |
+ |
+ACTION_P(CheckCallbackHappenedUsingVerifier, verifier) { |
ddorwin
2014/08/08 21:15:26
ditto
jrummell
2014/08/08 23:39:59
Acknowledged.
|
+ verifier->B(); |
+} |
+ |
+} // namespace |
+ |
namespace media { |
class VideoDecoderSelectorTest : public ::testing::Test { |
@@ -51,6 +68,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 +98,13 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
if (decryptor_capability == kDecryptOnly || |
decryptor_capability == kDecryptAndDecode) { |
EXPECT_CALL(*this, SetDecryptorReadyCallback(_)) |
- .WillRepeatedly(RunCallback<0>(decryptor_.get())); |
+ .WillRepeatedly(ExecuteCallbackWithVerifier( |
+ decryptor_.get(), |
+ base::Bind(&VideoDecoderSelectorTest::DecryptorSet, |
+ base::Unretained(this)), |
+ &verifier_)); |
+ EXPECT_CALL(*this, DecryptorSet(Eq(true))) |
+ .WillRepeatedly(CheckCallbackHappenedUsingVerifier(&verifier_)); |
if (decryptor_capability == kDecryptOnly) { |
EXPECT_CALL(*decryptor_, InitializeVideoDecoder(_, _)) |
@@ -145,6 +169,8 @@ class VideoDecoderSelectorTest : public ::testing::Test { |
base::MessageLoop message_loop_; |
+ MatchingCallbackVerifier verifier_; |
+ |
private: |
DISALLOW_COPY_AND_ASSIGN(VideoDecoderSelectorTest); |
}; |