Extend EME player_utils.js to support onEncrypted.

media/test/data/eme_player_js/player_utils.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The PlayerUtils provides utility functions to binding common media events
 // to specific player functions. It also provides functions to load media source
 // base on test configurations.
 var PlayerUtils = new function() {
 }
 
 // Prepares a video element for playback by setting default event handlers
 // and source attribute.
 PlayerUtils.registerDefaultEventListeners = function(player) {
   Utils.timeLog('Registering video event handlers.');
   // Map from event name to event listener function name.  It is common for
   // event listeners to be named onEventName.
   var eventListenerMap = {
     'needkey': 'onNeedKey',
+    'encrypted': 'onEncrypted',
     'webkitneedkey': 'onWebkitNeedKey',
     'webkitkeymessage': 'onWebkitKeyMessage',
     'webkitkeyadded': 'onWebkitKeyAdded',
     'webkitkeyerror': 'onWebkitKeyError'
   };
   for (eventName in eventListenerMap) {
     var eventListenerFunction = player[eventListenerMap[eventName]];
     if (eventListenerFunction) {
       player.video.addEventListener(eventName, function(e) {
         player[eventListenerMap[e.type]](e);
       });
     }
   }
   // List of events that fail tests.
   var failingEvents = ['error', 'abort'];
   for (var i = 0; i < failingEvents.length; i++) {
     player.video.addEventListener(failingEvents[i], Utils.failTest);
   }
 };
 
 PlayerUtils.registerEMEEventListeners = function(player) {
-  player.video.addEventListener('needkey', function(message) {
+  var encrypted_handler = function(message) {
 
     function addMediaKeySessionListeners(mediaKeySession) {
       mediaKeySession.addEventListener('message', function(message) {
         player.video.receivedKeyMessage = true;
         if (Utils.isHeartBeatMessage(message.message)) {
           Utils.timeLog('MediaKeySession onMessage - heart beat', message);
           player.video.receivedHeartbeat = true;
         }
         player.onMessage(message);
       });
       mediaKeySession.addEventListener('error', function(error) {
         Utils.failTest(error, KEY_ERROR);
       });
     }
 
-    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);
             });
       }
     } 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);
     MediaKeys.create(player.testConfig.keySystem).then(function(mediaKeys) {
       player.video.setMediaKeys(mediaKeys);
     }).catch(function(error) {
       Utils.failTest(error, NOTSUPPORTEDERROR);
     });
   } catch (e) {
     Utils.failTest(e);
@@ skipping 89 matching lines @@
       default:
         Utils.timeLog(keySystem + ' is not a known key system');
         if (usePrefixedEME)
           return PrefixedClearKeyPlayer;
         return ClearKeyPlayer;
     }
   }
   var Player = getPlayerType(testConfig.keySystem);
   return new Player(video, testConfig);
 };