Index: media/test/data/eme_player_js/prefixed_clearkey_player.js |
diff --git a/chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js b/media/test/data/eme_player_js/prefixed_clearkey_player.js |
similarity index 88% |
rename from chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js |
rename to media/test/data/eme_player_js/prefixed_clearkey_player.js |
index cbca7d3305b9251d5bc1c80821fd7fbed5ef586e..40d927d21b4791a1d7134c6046fe764f720b65a2 100644 |
--- a/chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js |
+++ b/media/test/data/eme_player_js/prefixed_clearkey_player.js |
@@ -17,6 +17,10 @@ PrefixedClearKeyPlayer.prototype.registerEventListeners = function() { |
PlayerUtils.registerPrefixedEMEEventListeners(this); |
}; |
+PrefixedClearKeyPlayer.prototype.registerEventListeners = function(video) { |
jrummell
2014/07/02 00:33:40
Does this replace the definition above?
shadi
2014/07/02 19:23:36
This was an error due to merge. It is fixed on my
|
+ RegisterPrefixedEMEEventListeners(this, video); |
+}; |
+ |
PrefixedClearKeyPlayer.prototype.onWebkitKeyMessage = function(message) { |
var initData = |
Utils.getInitDataFromMessage(message, this.testConfig.mediaType); |