Extend EME player_utils.js to support onEncrypted.

media/test/data/eme_player_js/player_utils.js

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 42ec7429d4d3b682cbf920221f6f87528ccd849e..c17f284cb534a7e5819a2387a057dfd3e5d659b5 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -16,6 +16,7 @@ PlayerUtils.registerDefaultEventListeners = function(player) {
   // event listeners to be named onEventName.
   var eventListenerMap = {
     'needkey': 'onNeedKey',
+    'encrypted': 'onEncrypted',
     'webkitneedkey': 'onWebkitNeedKey',
     'webkitkeymessage': 'onWebkitKeyMessage',
     'webkitkeyadded': 'onWebkitKeyAdded',
@@ -37,7 +38,7 @@ PlayerUtils.registerDefaultEventListeners = function(player) {
 };
 
 PlayerUtils.registerEMEEventListeners = function(player) {
-  player.video.addEventListener('needkey', function(message) {
+  var encrypted_handler = function(message) {
 
     function addMediaKeySessionListeners(mediaKeySession) {
       mediaKeySession.addEventListener('message', function(message) {
@@ -53,22 +54,24 @@ PlayerUtils.registerEMEEventListeners = function(player) {
       });
     }
 
-    Utils.timeLog('Creating new media key session for contentType: ' +
-                  message.contentType + ', initData: ' +
-                  Utils.getHexString(message.initData));
+    // TODO(sandersd): Stop checking contentType once needkey is gone.

[ddorwin, 2014/09/26 23:51:46]

nit: It's really once we switch to the new encrypted event type for unprefixed.
IOW, it's not clear from this message that this doesn't include prefixed or that
you care more about the type than the event name.

[sandersd (OOO until July 31), 2014/09/26 23:57:15]

Done.

+    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.
         var session = message.target.mediaKeys.createSession();
         addMediaKeySessionListeners(session);
-        session.generateRequest(message.contentType, message.initData)
+        session.generateRequest(init_data_type, message.initData)
           .catch(function(error) {
             Utils.failTest(error, KEY_ERROR);
           });
       } else {
         var session = message.target.mediaKeys.createSession(
-            message.contentType, message.initData);
+            init_data_type, message.initData);
         session.then(addMediaKeySessionListeners)
             .catch(function(error) {
               Utils.failTest(error, KEY_ERROR);
@@ -77,7 +80,15 @@ PlayerUtils.registerEMEEventListeners = function(player) {
     } catch (e) {
       Utils.failTest(e);
     }
-  });
+  }
+
+  // TODO(sandersd): Stop registering needkey.

[ddorwin, 2014/09/26 23:51:46]

... after it is renamed.

[sandersd (OOO until July 31), 2014/09/26 23:57:15]

Done.

+  if (player.video.onencrypted) {
+    player.video.addEventListener('encrypted', encrypted_handler);
+  } else {
+    player.video.addEventListener('needkey', encrypted_handler);
+  }
+
   this.registerDefaultEventListeners(player);
   try {
     Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem);