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

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

Issue 550933003: Update eme_player tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « media/test/data/eme_player_js/globals.js ('k') | media/test/data/eme_player_js/widevine_player.js » ('j') | 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 ac7b6dd10e56a0bf23613fb42b68ed3557babdf6..5d6d0c64c5568b3a680ad231cd24e6115e49426c 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -59,14 +59,10 @@ PlayerUtils.registerEMEEventListeners = function(player) {
try {
var session = message.target.mediaKeys.createSession(
message.contentType, message.initData);
- if (PROMISES_SUPPORTED) {
- session.then(addMediaKeySessionListeners)
- .catch (function(error) {
- Utils.failTest(error, KEY_ERROR);
- });
- } else {
- addMediaKeySessionListeners(session);
- }
+ session.then(addMediaKeySessionListeners)
+ .catch(function(error) {
+ Utils.failTest(error, KEY_ERROR);
+ });
} catch (e) {
Utils.failTest(e);
}
@@ -74,15 +70,11 @@ PlayerUtils.registerEMEEventListeners = function(player) {
this.registerDefaultEventListeners(player);
try {
Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem);
- if (PROMISES_SUPPORTED) {
- MediaKeys.create(player.testConfig.keySystem).then(function(mediaKeys) {
- player.video.setMediaKeys(mediaKeys);
- }).catch(function(error) {
- Utils.failTest(error, NOTSUPPORTEDERROR);
- });
- } else {
- player.video.setMediaKeys(new MediaKeys(player.testConfig.keySystem));
- }
+ MediaKeys.create(player.testConfig.keySystem).then(function(mediaKeys) {
+ player.video.setMediaKeys(mediaKeys);
+ }).catch(function(error) {
+ Utils.failTest(error, NOTSUPPORTEDERROR);
+ });
} catch (e) {
Utils.failTest(e);
}
« no previous file with comments | « media/test/data/eme_player_js/globals.js ('k') | media/test/data/eme_player_js/widevine_player.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698