Revert "Add unprefixed EME tests for LoadSession()"

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 4594c8e2e08f8bd167ae1b39958774cb0ceb4b7b..16f3de6c5d86d60cc1dad0191bac56078f7b4253 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -57,23 +57,26 @@ 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: ' +
+                  Utils.getHexString(new Uint8Array(message.initData)));
     try {
-      if (player.testConfig.sessionToLoad) {
-        Utils.timeLog('Loading session: ' + player.testConfig.sessionToLoad);
-        var session = message.target.mediaKeys.createSession('persistent');
-        addMediaKeySessionListeners(session);
-        session.load(player.testConfig.sessionToLoad)
-            .catch(function(error) { Utils.failTest(error, KEY_ERROR); });
-      } else {
-        Utils.timeLog('Creating new media key session for initDataType: ' +
-                      init_data_type + ', initData: ' +
-                      Utils.getHexString(new Uint8Array(message.initData)));
+      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)
           .catch(function(error) {
             Utils.failTest(error, KEY_ERROR);
           });
+      } else {
+        var session = message.target.mediaKeys.createSession(
+            init_data_type, message.initData);
+        session.then(addMediaKeySessionListeners)
+            .catch(function(error) {
+              Utils.failTest(error, KEY_ERROR);
+            });
       }
     } catch (e) {
       Utils.failTest(e);