| 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..03a1bcee9d7b46e94f966f6857c4e639dabe874f 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"
|
| @@ -123,7 +124,8 @@ 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;
|
| + bool has_additional_usable_key,
|
| + CdmKeysInfo keys_info) = 0;
|
|
|
| // Errors are not expected unless overridden.
|
| virtual void OnSessionError(const std::string& web_session_id,
|
| @@ -162,8 +164,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,
|
| + CdmKeysInfo keys_info) {
|
| + app_->OnSessionKeysChange(web_session_id, has_additional_usable_key,
|
| + keys_info.Pass());
|
| }
|
|
|
| void OnSessionError(const std::string& web_session_id,
|
| @@ -258,7 +262,8 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
|
| }
|
|
|
| void OnSessionKeysChange(const std::string& web_session_id,
|
| - bool has_additional_usable_key) override {
|
| + bool has_additional_usable_key,
|
| + CdmKeysInfo keys_info) override {
|
| EXPECT_EQ(current_session_id_, web_session_id);
|
| EXPECT_EQ(has_additional_usable_key, true);
|
| }
|
| @@ -383,7 +388,8 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
|
| }
|
|
|
| void OnSessionKeysChange(const std::string& web_session_id,
|
| - bool has_additional_usable_key) override {
|
| + bool has_additional_usable_key,
|
| + CdmKeysInfo keys_info) override {
|
| EXPECT_FALSE(web_session_id.empty());
|
| EXPECT_EQ(has_additional_usable_key, true);
|
| }
|
|
|