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

Unified Diff: media/test/data/eme_player_js/player_utils.js

Issue 544283002: Update eme_player to handle MediaKeySession.generateRequest() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/data/eme_player_js/player_utils.js
diff --git a/media/test/data/eme_player_js/player_utils.js b/media/test/data/eme_player_js/player_utils.js
index 5d6d0c64c5568b3a680ad231cd24e6115e49426c..42ec7429d4d3b682cbf920221f6f87528ccd849e 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -57,12 +57,23 @@ PlayerUtils.registerEMEEventListeners = function(player) {
message.contentType + ', initData: ' +
Utils.getHexString(message.initData));
try {
- var session = message.target.mediaKeys.createSession(
- message.contentType, message.initData);
- session.then(addMediaKeySessionListeners)
+ if (message.target.mediaKeys.createSession.length == 0) {
+ // FIXME(jrummell): Remove this test (and else branch) once blink
+ // uses the new API.
+ var session = message.target.mediaKeys.createSession();
+ addMediaKeySessionListeners(session);
+ session.generateRequest(message.contentType, message.initData)
.catch(function(error) {
Utils.failTest(error, KEY_ERROR);
});
+ } else {
+ var session = message.target.mediaKeys.createSession(
+ message.contentType, message.initData);
+ session.then(addMediaKeySessionListeners)
+ .catch(function(error) {
+ Utils.failTest(error, KEY_ERROR);
+ });
+ }
} catch (e) {
Utils.failTest(e);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698