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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index d326a6c24c9b91e66c3e887b56c63cebd0254a04..84e917c7172bc214e2b79581d8eb97d6988ad8c6 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -653,7 +653,8 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
base::Bind(&PipelineIntegrationTest::OnVideoFramePaint,
base::Unretained(this)),
base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack,
- base::Unretained(this)));
+ base::Unretained(this)),
+ base::Closure());
message_loop_.Run();
EXPECT_EQ(PIPELINE_OK, pipeline_status_);
}
@@ -693,7 +694,8 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
base::Bind(&PipelineIntegrationTest::OnVideoFramePaint,
base::Unretained(this)),
base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack,
- base::Unretained(this)));
+ base::Unretained(this)),
+ base::Closure());
ddorwin 2015/02/19 05:33:17 Shouldn't we check this here - this is the EME fun
jrummell 2015/02/23 22:06:32 Done.
source->set_encrypted_media_init_data_cb(
base::Bind(&FakeEncryptedMedia::OnEncryptedMediaInitData,

Powered by Google App Engine
This is Rietveld 408576698