Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: media/filters/video_frame_stream_unittest.cc

Issue 416333011: Allow setContentDecryptionModule() to get called when setting is done. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: const & Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/video_frame_stream_unittest.cc
diff --git a/media/filters/video_frame_stream_unittest.cc b/media/filters/video_frame_stream_unittest.cc
index 492e7cf9ffbb50e3b17f6fdfa28e7c46940a5fa5..b91e433f44c42f0ffbba0a18fe3ddb6309a488ba 100644
--- a/media/filters/video_frame_stream_unittest.cc
+++ b/media/filters/video_frame_stream_unittest.cc
@@ -219,15 +219,15 @@ class VideoFrameStreamTest
break;
case DECRYPTOR_NO_KEY:
- EXPECT_CALL(*this, SetDecryptorReadyCallback(_))
- .WillRepeatedly(RunCallback<0>(decryptor_.get()));
+ EXPECT_CALL(*this, SetDecryptorReadyCallback(_)).WillRepeatedly(
+ RunCallback<0>(decryptor_.get(), base::Bind(&base::DoNothing)));
ddorwin 2014/07/30 22:35:46 ditto
has_no_key_ = true;
ReadOneFrame();
break;
case DECODER_INIT:
- EXPECT_CALL(*this, SetDecryptorReadyCallback(_))
- .WillRepeatedly(RunCallback<0>(decryptor_.get()));
+ EXPECT_CALL(*this, SetDecryptorReadyCallback(_)).WillRepeatedly(
+ RunCallback<0>(decryptor_.get(), base::Bind(&base::DoNothing)));
decoder_->HoldNextInit();
InitializeVideoFrameStream();
break;

Powered by Google App Engine
This is Rietveld 408576698