Remove support for contentType from player_utils.js.

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) {
-  var encrypted_handler = function(message) {
+  player.video.addEventListener('encrypted', 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);
       });
     }
 
-    // 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) {
         // FIXME(jrummell): Remove this test (and else branch) once blink
         // 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);
             });
       }
     } catch (e) {
       Utils.failTest(e);
     }
-  }
-
-  // TODO(sandersd): Stop registering 'needkey' after it is renamed to
-  // 'encrypted'.
-  player.video.addEventListener('encrypted', encrypted_handler);
-  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) {
@@ skipping 90 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);
 };