Update eme_player tests

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() {
 }
 
@@ skipping 41 matching lines @@
         Utils.failTest(error, KEY_ERROR);
       });
     }
 
     Utils.timeLog('Creating new media key session for contentType: ' +
                   message.contentType + ', initData: ' +
                   Utils.getHexString(message.initData));
     try {
       var session = message.target.mediaKeys.createSession(
           message.contentType, message.initData);
-      if (PROMISES_SUPPORTED) {
-        session.then(addMediaKeySessionListeners)
-            .catch (function(error) {
-              Utils.failTest(error, KEY_ERROR);
-            });
-      } else {
-        addMediaKeySessionListeners(session);
-      }
+      session.then(addMediaKeySessionListeners)
+          .catch(function(error) {
+            Utils.failTest(error, KEY_ERROR);
+          });
     } catch (e) {
       Utils.failTest(e);
     }
   });
   this.registerDefaultEventListeners(player);
   try {
     Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem);
-    if (PROMISES_SUPPORTED) {
-      MediaKeys.create(player.testConfig.keySystem).then(function(mediaKeys) {
-        player.video.setMediaKeys(mediaKeys);
-      }).catch(function(error) {
-        Utils.failTest(error, NOTSUPPORTEDERROR);
-      });
-    } else {
-      player.video.setMediaKeys(new MediaKeys(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);
   }
 };
 
 PlayerUtils.registerPrefixedEMEEventListeners = function(player) {
  player.video.addEventListener('webkitneedkey', function(message) {
     var initData = message.initData;
     if (player.testConfig.sessionToLoad) {
       Utils.timeLog('Loading session: ' + player.testConfig.sessionToLoad);
@@ skipping 81 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);
 };