Revert "Add unprefixed EME tests for LoadSession()"

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 39 matching lines @@
         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: ' +
+                  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);
     }
   }
 
   // TODO(sandersd): Stop registering 'needkey' after it is renamed to
   // 'encrypted'.
   player.video.addEventListener('encrypted', encrypted_handler);
   player.video.addEventListener('needkey', encrypted_handler);
@@ skipping 100 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);
 };