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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2831963003: EME: Allow temporary sessions to be removed for ClearKey only. (Closed)
Patch Set: Created 3 years, 8 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 ee4c41e8c9f87ecff9c9cf93786f57b4e29c2318..5d37fd1b82c692b42a5c148c24a7ac63e23fad23 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -208,6 +208,9 @@ class FakeEncryptedMedia {
bool has_additional_usable_key,
CdmKeysInfo keys_info) = 0;
+ virtual void OnSessionExpirationUpdate(const std::string& session_id,
+ base::Time new_expiry_time) = 0;
+
virtual void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
AesDecryptor* decryptor) = 0;
@@ -221,6 +224,8 @@ class FakeEncryptedMedia {
base::Bind(&FakeEncryptedMedia::OnSessionClosed,
base::Unretained(this)),
base::Bind(&FakeEncryptedMedia::OnSessionKeysChange,
+ base::Unretained(this)),
+ base::Bind(&FakeEncryptedMedia::OnSessionExpirationUpdate,
base::Unretained(this)))),
cdm_context_(decryptor_.get()),
app_(app) {}
@@ -245,6 +250,11 @@ class FakeEncryptedMedia {
std::move(keys_info));
}
+ void OnSessionExpirationUpdate(const std::string& session_id,
+ base::Time new_expiry_time) {
+ app_->OnSessionExpirationUpdate(session_id, new_expiry_time);
+ }
+
void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data) {
app_->OnEncryptedMediaInitData(init_data_type, init_data, decryptor_.get());
@@ -354,6 +364,11 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
EXPECT_EQ(has_additional_usable_key, true);
}
+ void OnSessionExpirationUpdate(const std::string& session_id,
+ base::Time new_expiry_time) override {
+ EXPECT_EQ(current_session_id_, session_id);
+ }
+
void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
AesDecryptor* decryptor) override {
@@ -437,6 +452,9 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
EXPECT_EQ(has_additional_usable_key, true);
}
+ void OnSessionExpirationUpdate(const std::string& session_id,
+ base::Time new_expiry_time) override {}
+
void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
const std::vector<uint8_t>& init_data,
AesDecryptor* decryptor) override {}

Powered by Google App Engine
This is Rietveld 408576698