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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ScopedVector Created 5 years, 11 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 279c12221ce254fc8ad78714774e15b3b1bda807..e362a52997bf9da04b0a8f5f324b8da1d5a590e3 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,
+ const 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,
+ const CdmKeysInfo& keys_info) {
+ app_->OnSessionKeysChange(web_session_id, has_additional_usable_key,
+ keys_info);
}
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,
+ const 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,
+ const CdmKeysInfo& keys_info) override {
EXPECT_FALSE(web_session_id.empty());
EXPECT_EQ(has_additional_usable_key, true);
}
« media/mojo/services/media_type_converters.h ('K') | « media/mojo/services/mojo_cdm_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698