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

Unified Diff: chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js

Issue 308553002: Integrate browser tests with new EME player. (Closed) Base URL: http://git.chromium.org/chromium/src.git@eme_player
Patch Set: Created 6 years, 7 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
Index: chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js
diff --git a/chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js b/chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js
index 9cbeffb655fd01e6bf3d4dd26bd7616d5b37d586..68e86fc33fc07db271b074d841542982035060ec 100644
--- a/chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js
+++ b/chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js
@@ -12,17 +12,9 @@ PrefixedClearKeyPlayer.prototype.init = function(video) {
};
PrefixedClearKeyPlayer.prototype.onWebkitKeyMessage = function(message) {
- if (Utils.isHeartBeatMessage(message.message)) {
- Utils.timeLog('onWebkitKeyMessage - heart beat', message);
- return;
- }
- var initData = message.message;
- // If content uses mp4, then message.message is PSSH data. Instead of parsing
- // that data we hard code the initData.
- if (TestConfig.mediaType.indexOf('mp4') != -1)
- // Temporary hack for Clear Key in v0.1.
- initData = Utils.convertToUint8Array(KEY_ID);
+ var initData = Utils.getInitDataFromMessage(message, TestConfig.mediaType);
+ var key = Utils.getDefaultKey(TestConfig.forceInvalidResponse);
Utils.timeLog('Adding key to sessionID: ' + message.sessionId);
- message.target.webkitAddKey(TestConfig.keySystem, KEY, initData,
+ message.target.webkitAddKey(TestConfig.keySystem, key, initData,
message.sessionId);
};

Powered by Google App Engine
This is Rietveld 408576698