diff options
author | jrummell <jrummell@chromium.org> | 2015-01-13 16:34:32 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 00:35:31 +0000 |
commit | c842f110b2b69639b4764e85d48dd404f6de8ee4 (patch) | |
tree | 7d769946dc293212ca32746fb46d19d6b9c877e2 /media/test/pipeline_integration_test.cc | |
parent | 6ebc820381ef4694c6bbef164c84181ec434ae3c (diff) | |
download | chromium_src-c842f110b2b69639b4764e85d48dd404f6de8ee4.zip chromium_src-c842f110b2b69639b4764e85d48dd404f6de8ee4.tar.gz chromium_src-c842f110b2b69639b4764e85d48dd404f6de8ee4.tar.bz2 |
Add |legacy_destination_url| back to SessionMessage for EME
Recent changes to CDM_7 removed |destination_url| as it is no longer
used in the EME spec. However legacy applications using the prefixed
EME API depend on it, so adding it back in so that it is available
to those applications.
BUG=448242
TEST=existing EME tests pass + Play movies play
Review URL: https://codereview.chromium.org/813683005
Cr-Commit-Position: refs/heads/master@{#311371}
Diffstat (limited to 'media/test/pipeline_integration_test.cc')
-rw-r--r-- | media/test/pipeline_integration_test.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index f6ef961..1f616a5 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"; |