Reland "Add unprefixed EME tests for LoadSession()"

Also adds changes for content_browsertests which share the
JavaScript files.

BUG=338830
TEST=new EME tests pass

Review URL: https://codereview.chromium.org/642813012

Cr-Commit-Position: refs/heads/master@{#300519}

2 files changed, 19 insertions, 13 deletions

diff --git a/media/test/data/eme_player_js/player_utils.js b/media/test/data/eme_player_js/player_utils.js
index 5f524ba..634cc31 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -53,26 +53,23 @@ PlayerUtils.registerEMEEventListeners = function(player) {
       });
     }
 
-    Utils.timeLog('Creating new media key session for initDataType: ' +
-                  message.initDataType + ', 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); });
+      } else {
+        Utils.timeLog('Creating new media key session for initDataType: ' +
+                      message.initDataType + ', initData: ' +
+                      Utils.getHexString(new Uint8Array(message.initData)));
         var session = message.target.mediaKeys.createSession();
         addMediaKeySessionListeners(session);
         session.generateRequest(message.initDataType, message.initData)
           .catch(function(error) {
             Utils.failTest(error, KEY_ERROR);
           });
-      } else {
-        var session = message.target.mediaKeys.createSession(
-            message.initDataType, message.initData);
-        session.then(addMediaKeySessionListeners)
-            .catch(function(error) {
-              Utils.failTest(error, KEY_ERROR);
-            });
       }
     } catch (e) {
       Utils.failTest(e);
diff --git a/media/test/data/eme_player_js/test_config.js b/media/test/data/eme_player_js/test_config.js
index 8be8a9a..6484eb5 100644
--- a/media/test/data/eme_player_js/test_config.js
+++ b/media/test/data/eme_player_js/test_config.js
@@ -28,6 +28,15 @@ TestConfig.prototype.loadQueryParams = function() {
   this.useMSE = this.useMSE == '1' || this.useMSE == 'true';
   this.usePrefixedEME =
       this.usePrefixedEME == '1' || this.usePrefixedEME == 'true';
+
+  // Validate that the prefixed/unprefixed EME is available.
+  if (this.usePrefixedEME) {
+    if (EME_DISABLED_OPTIONS.indexOf(EME_PREFIXED_VERSION) >= 0)
+      Utils.failTest('Prefixed EME not available.')
+  } else {
+    if (EME_DISABLED_OPTIONS.indexOf(EME_UNPREFIXED_VERSION) >= 0)
+      Utils.failTest('Unprefixed EME not available.')
+  }
 };
 
 TestConfig.updateDocument = function() {