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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/video_decoder_selector_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
« media/filters/decrypting_video_decoder_unittest.cc ('K') | « media/filters/pipeline_integration_test_base.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | media/filters/video_frame_stream_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..22d16c51863390160ff22f354ee35c40b705cc08 100644
--- a/media/filters/video_decoder_selector_unittest.cc
+++ b/media/filters/video_decoder_selector_unittest.cc
@@ -79,8 +79,8 @@ class VideoDecoderSelectorTest : public ::testing::Test {
if (decryptor_capability == kDecryptOnly ||
decryptor_capability == kDecryptAndDecode) {
- 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
if (decryptor_capability == kDecryptOnly) {
EXPECT_CALL(*decryptor_, InitializeVideoDecoder(_, _))
« media/filters/decrypting_video_decoder_unittest.cc ('K') | « media/filters/pipeline_integration_test_base.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | media/filters/video_frame_stream_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698