Index: media/test/pipeline_integration_test.cc |
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc |
index 279c12221ce254fc8ad78714774e15b3b1bda807..359d6914507b9bb50f77b5f56c8926f67c1db4eb 100644 |
--- a/media/test/pipeline_integration_test.cc |
+++ b/media/test/pipeline_integration_test.cc |
@@ -9,6 +9,7 @@ |
#include "build/build_config.h" |
#include "media/base/cdm_callback_promise.h" |
#include "media/base/cdm_context.h" |
+#include "media/base/cdm_key_information.h" |
#include "media/base/decoder_buffer.h" |
#include "media/base/media_keys.h" |
#include "media/base/media_switches.h" |
@@ -122,8 +123,10 @@ class FakeEncryptedMedia { |
virtual void OnSessionClosed(const std::string& web_session_id) = 0; |
- virtual void OnSessionKeysChange(const std::string& web_session_id, |
- bool has_additional_usable_key) = 0; |
+ virtual void OnSessionKeysChange( |
+ const std::string& web_session_id, |
+ bool has_additional_usable_key, |
+ const CdmKeyInformationVector& key_information) = 0; |
// Errors are not expected unless overridden. |
virtual void OnSessionError(const std::string& web_session_id, |
@@ -162,8 +165,10 @@ class FakeEncryptedMedia { |
} |
void OnSessionKeysChange(const std::string& web_session_id, |
- bool has_additional_usable_key) { |
- app_->OnSessionKeysChange(web_session_id, has_additional_usable_key); |
+ bool has_additional_usable_key, |
+ const CdmKeyInformationVector& key_information) { |
+ app_->OnSessionKeysChange(web_session_id, has_additional_usable_key, |
+ key_information); |
} |
void OnSessionError(const std::string& web_session_id, |
@@ -257,8 +262,10 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase { |
EXPECT_EQ(current_session_id_, web_session_id); |
} |
- void OnSessionKeysChange(const std::string& web_session_id, |
- bool has_additional_usable_key) override { |
+ void OnSessionKeysChange( |
+ const std::string& web_session_id, |
+ bool has_additional_usable_key, |
+ const CdmKeyInformationVector& key_information) override { |
EXPECT_EQ(current_session_id_, web_session_id); |
EXPECT_EQ(has_additional_usable_key, true); |
} |
@@ -382,8 +389,10 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase { |
FAIL() << "Unexpected Closed"; |
} |
- void OnSessionKeysChange(const std::string& web_session_id, |
- bool has_additional_usable_key) override { |
+ void OnSessionKeysChange( |
+ const std::string& web_session_id, |
+ bool has_additional_usable_key, |
+ const CdmKeyInformationVector& key_information) override { |
EXPECT_FALSE(web_session_id.empty()); |
EXPECT_EQ(has_additional_usable_key, true); |
} |