Remove support for contentType from player_utils.js.

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 0e92ecd8b1990eee00d66ce0160e197f938cc9e8..27577541547350069da0a252e0bf81f454c5a2fc 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -15,7 +15,7 @@ PlayerUtils.registerDefaultEventListeners = function(player) {
   // Map from event name to event listener function name.  It is common for
   // event listeners to be named onEventName.
   var eventListenerMap = {
-    'needkey': 'onNeedKey',
+s   'needkey': 'onNeedKey',

[jrummell, 2014/10/14 22:44:53]

Does this line start with 's'?

[sandersd (OOO until July 31), 2014/10/14 22:52:51]

Whoops, no, this line shouldn't exist at all.

     'encrypted': 'onEncrypted',
     'webkitneedkey': 'onWebkitNeedKey',
     'webkitkeymessage': 'onWebkitKeyMessage',
@@ -38,7 +38,7 @@ PlayerUtils.registerDefaultEventListeners = function(player) {
 };
 
 PlayerUtils.registerEMEEventListeners = function(player) {
-  var encrypted_handler = function(message) {
+  player.video.addEventListener('encrypted', function(message) {
 
     function addMediaKeySessionListeners(mediaKeySession) {
       mediaKeySession.addEventListener('message', function(message) {
@@ -54,11 +54,8 @@ 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: ' +
+                  message.initDataType + ', initData: ' +
                   Utils.getHexString(new Uint8Array(message.initData)));
     try {
       if (message.target.mediaKeys.createSession.length == 0) {
@@ -66,13 +63,13 @@ PlayerUtils.registerEMEEventListeners = function(player) {
         // uses the new API.
         var session = message.target.mediaKeys.createSession();
         addMediaKeySessionListeners(session);
-        session.generateRequest(init_data_type, message.initData)
+        session.generateRequest(message.initDataType, message.initData)
           .catch(function(error) {
             Utils.failTest(error, KEY_ERROR);
           });
       } else {
         var session = message.target.mediaKeys.createSession(
-            init_data_type, message.initData);
+            message.initDataType, message.initData);
         session.then(addMediaKeySessionListeners)
             .catch(function(error) {
               Utils.failTest(error, KEY_ERROR);
@@ -81,15 +78,7 @@ PlayerUtils.registerEMEEventListeners = function(player) {
     } catch (e) {
       Utils.failTest(e);
     }
-  }
-
-  // TODO(sandersd): Stop registering 'needkey' after it is renamed to
-  // 'encrypted'.
-  if (player.video.onencrypted) {
-    player.video.addEventListener('encrypted', encrypted_handler);
-  } else {
-    player.video.addEventListener('needkey', encrypted_handler);
-  }
+  });
 
   this.registerDefaultEventListeners(player);
   try {