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

Unified Diff: media/test/pipeline_integration_test_base.cc

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android changes 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_base.cc
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index d40b0dcbc2f098d2ad72597c3c99b7b9bce7a462..e122d9a83fca2e6254717cbc02cb3efa16a9ed9a 100644
--- a/media/test/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -121,6 +121,10 @@ PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
base::Unretained(this)));
}
+ // Should never be called as the required decryption keys for the encrypted
+ // media files are provided in advance.
+ EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
+
pipeline_->Start(
demuxer_.get(), CreateRenderer(),
base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)),
@@ -134,7 +138,9 @@ PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint,
base::Unretained(this)),
base::Closure(), base::Bind(&PipelineIntegrationTestBase::OnAddTextTrack,
- base::Unretained(this)));
+ base::Unretained(this)),
+ base::Bind(&PipelineIntegrationTestBase::OnWaitingForDecryptionKey,
+ base::Unretained(this)));
message_loop_.Run();
return pipeline_status_;
}

Powered by Google App Engine
This is Rietveld 408576698