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

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

Issue 641443002: Add unprefixed EME tests for LoadSession() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add TODO (plus rebase) Created 6 years, 2 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/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/test/data/eme_player_js/test_config.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 16f3de6c5d86d60cc1dad0191bac56078f7b4253..4594c8e2e08f8bd167ae1b39958774cb0ceb4b7b 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -57,26 +57,23 @@ PlayerUtils.registerEMEEventListeners = function(player) {
// TODO(sandersd): Stop checking contentType once we complete the switch to
// using the 'encrypted' event.
var init_data_type = message.initDataType || message.contentType;
- Utils.timeLog('Creating new media key session for initDataType: ' +
- init_data_type + ', initData: ' +
- Utils.getHexString(new Uint8Array(message.initData)));
try {
- if (message.target.mediaKeys.createSession.length == 0) {
- // FIXME(jrummell): Remove this test (and else branch) once blink
- // uses the new API.
+ if (player.testConfig.sessionToLoad) {
+ Utils.timeLog('Loading session: ' + player.testConfig.sessionToLoad);
+ var session = message.target.mediaKeys.createSession('persistent');
+ addMediaKeySessionListeners(session);
+ session.load(player.testConfig.sessionToLoad)
+ .catch(function(error) { Utils.failTest(error, KEY_ERROR); });
+ } else {
+ Utils.timeLog('Creating new media key session for initDataType: ' +
+ init_data_type + ', initData: ' +
+ Utils.getHexString(new Uint8Array(message.initData)));
var session = message.target.mediaKeys.createSession();
addMediaKeySessionListeners(session);
session.generateRequest(init_data_type, message.initData)
.catch(function(error) {
Utils.failTest(error, KEY_ERROR);
});
- } else {
- var session = message.target.mediaKeys.createSession(
- init_data_type, message.initData);
- session.then(addMediaKeySessionListeners)
- .catch(function(error) {
- Utils.failTest(error, KEY_ERROR);
- });
}
} catch (e) {
Utils.failTest(e);
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/test/data/eme_player_js/test_config.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698