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 0e92ecd8b1990eee00d66ce0160e197f938cc9e8..69b268d5763557f12de4dad97be0415232283350 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -57,26 +57,23 @@ 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 (message.target.mediaKeys.createSession.length == 0) {
-        // FIXME(jrummell): Remove this test (and else branch) once blink
-        // uses the new API.
+      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); });

[ddorwin, 2014/10/08 22:04:28]

In theory, these catches aren't necessary because of line 79.

[jrummell, 2014/10/16 18:53:58]

Failed promises don't throw, so line 79 won't run.

+      } else {
+        Utils.timeLog('Creating new media key session for initDataType: ' +
+                      init_data_type + ', initData: ' +
+                      Utils.getHexString(new Uint8Array(message.initData)));
         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);