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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes 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
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | ppapi/api/private/ppb_content_decryptor_private.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index f6ef9619a0beeb9cce873e9490c357d8fe00c583..1f616a5c5b890b9422fc87c10870b762cd9d370e 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -148,7 +148,8 @@ class FakeEncryptedMedia {
virtual void OnSessionMessage(const std::string& web_session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8>& message) = 0;
+ const std::vector<uint8>& message,
+ const GURL& legacy_destination_url) = 0;
virtual void OnSessionClosed(const std::string& web_session_id) = 0;
@@ -184,8 +185,10 @@ class FakeEncryptedMedia {
// Callbacks for firing session events. Delegate to |app_|.
void OnSessionMessage(const std::string& web_session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8>& message) {
- app_->OnSessionMessage(web_session_id, message_type, message);
+ const std::vector<uint8>& message,
+ const GURL& legacy_destination_url) {
+ app_->OnSessionMessage(web_session_id, message_type, message,
+ legacy_destination_url);
}
void OnSessionClosed(const std::string& web_session_id) {
@@ -280,7 +283,8 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
void OnSessionMessage(const std::string& web_session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8>& message) override {
+ const std::vector<uint8>& message,
+ const GURL& legacy_destination_url) override {
EXPECT_FALSE(web_session_id.empty());
EXPECT_FALSE(message.empty());
EXPECT_EQ(current_session_id_, web_session_id);
@@ -406,7 +410,8 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
public:
void OnSessionMessage(const std::string& web_session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8>& message) override {
+ const std::vector<uint8>& message,
+ const GURL& legacy_destination_url) override {
EXPECT_FALSE(web_session_id.empty());
EXPECT_FALSE(message.empty());
FAIL() << "Unexpected Message";
« no previous file with comments | « media/mojo/services/mojo_cdm_service.cc ('k') | ppapi/api/private/ppb_content_decryptor_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698