Revert of Fix Flaky EncryptedMediaTest

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 62 matching lines @@
       }
     } catch (e) {
       Utils.failTest(e);
     }
   });
 
   this.registerDefaultEventListeners(player);
   try {
     Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem);
     if (typeof navigator.requestMediaKeySystemAccess == 'function') {
-      return navigator.requestMediaKeySystemAccess(player.testConfig.keySystem)
+      navigator.requestMediaKeySystemAccess(player.testConfig.keySystem)
           .then(function(access) { return access.createMediaKeys(); })
           .then(function(mediaKeys) { player.video.setMediaKeys(mediaKeys); })
           .catch(function(error) { Utils.failTest(error, NOTSUPPORTEDERROR); });
     } else {
       // TODO(jrummell): Remove this once the blink change for
       // requestMediaKeySystemAccess lands.
-      return MediaKeys.create(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);
-    // Return a failing promise.
-    return new Promise(function(resolve, reject) { reject(Error(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);
       initData = Utils.convertToUint8Array(
           PREFIXED_API_LOAD_SESSION_HEADER + player.testConfig.sessionToLoad);
@@ skipping 36 matching lines @@
     var mediaSource =
         MediaSourceUtils.loadMediaSourceFromTestConfig(player.testConfig);
     player.video.src = window.URL.createObjectURL(mediaSource);
   } else {
     Utils.timeLog('Loading media using src.');
     player.video.src = player.testConfig.mediaFile;
   }
 };
 
 PlayerUtils.initEMEPlayer = function(player) {
-  var promise = this.registerEMEEventListeners(player);
-  promise.then(function(result) { PlayerUtils.setVideoSource(player); })
-      .catch(function(error) { Utils.failTest(error, NOTSUPPORTEDERROR); });
+  this.registerEMEEventListeners(player);
+  this.setVideoSource(player);
 };
 
 PlayerUtils.initPrefixedEMEPlayer = function(player) {
   this.registerPrefixedEMEEventListeners(player);
   this.setVideoSource(player);
 };
 
 // Return the appropriate player based on test configuration.
 PlayerUtils.createPlayer = function(video, testConfig) {
   // Update keySystem if using prefixed Clear Key since it is not available as a
@@ skipping 21 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);
 };