Index: media/filters/ffmpeg_video_decoder_unittest.cc |
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc |
index 9d9c24d1c38725118cc5a41dbf7162d4d7d0ccd7..779320b08cac46eaffbcd81a6c0d12843d03c61f 100644 |
--- a/media/filters/ffmpeg_video_decoder_unittest.cc |
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc |
@@ -10,6 +10,7 @@ |
#include "base/message_loop.h" |
#include "base/memory/singleton.h" |
#include "base/string_util.h" |
+#include "media/base/callback_util.h" |
#include "media/base/decoder_buffer.h" |
#include "media/base/decrypt_config.h" |
#include "media/base/limits.h" |
@@ -62,10 +63,6 @@ ACTION_P(ReturnBuffer, buffer) { |
arg0.Run(buffer ? DemuxerStream::kOk : DemuxerStream::kAborted, buffer); |
} |
-ACTION_P2(RunDecryptCB, status, buffer) { |
- arg2.Run(status, buffer); |
-} |
- |
class FFmpegVideoDecoderTest : public testing::Test { |
public: |
FFmpegVideoDecoderTest() |
@@ -469,7 +466,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_Normal) { |
// Simulate decoding a single encrypted frame. |
EXPECT_CALL(*decryptor_, |
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _)) |
- .WillRepeatedly(RunDecryptCB(Decryptor::kSuccess, i_frame_buffer_)); |
+ .WillRepeatedly(RunCallback<2>(Decryptor::kSuccess, i_frame_buffer_)); |
VideoDecoder::Status status; |
scoped_refptr<VideoFrame> video_frame; |
@@ -489,8 +486,8 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_DecryptError) { |
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_)); |
EXPECT_CALL(*decryptor_, |
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _)) |
- .WillRepeatedly(RunDecryptCB(Decryptor::kError, |
- scoped_refptr<media::DecoderBuffer>())); |
+ .WillRepeatedly(RunCallback<2>(Decryptor::kError, |
+ scoped_refptr<media::DecoderBuffer>())); |
// Our read should still get satisfied with end of stream frame during an |
// error. |
@@ -512,8 +509,8 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_NoDecryptionKey) { |
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_)); |
EXPECT_CALL(*decryptor_, |
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _)) |
- .WillRepeatedly(RunDecryptCB(Decryptor::kNoKey, |
- scoped_refptr<media::DecoderBuffer>())); |
+ .WillRepeatedly(RunCallback<2>(Decryptor::kNoKey, |
+ scoped_refptr<media::DecoderBuffer>())); |
// Our read should still get satisfied with end of stream frame during an |
// error. |
@@ -536,8 +533,8 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_CorruptedBufferReturned) { |
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_)); |
EXPECT_CALL(*decryptor_, |
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _)) |
- .WillRepeatedly(RunDecryptCB(Decryptor::kSuccess, |
- corrupt_i_frame_buffer_)); |
+ .WillRepeatedly(RunCallback<2>(Decryptor::kSuccess, |
+ corrupt_i_frame_buffer_)); |
// The decoder only detects the error at the second decoding call. So |
// |statistics_cb_| still gets called once. |
EXPECT_CALL(statistics_cb_, OnStatistics(_)); |