Reland "Add unprefixed EME tests for LoadSession()"

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

Committed: https://crrev.com/c467d23a1853a9c740fd20cf96766e9540af50e7
Cr-Commit-Position: refs/heads/master@{#300519}

[jrummell, 2014-10-17 01:09:55]

jrummell@chromium.org changed reviewers:
+ ddorwin@chromium.org, sandersd@chromium.org, xhwang@chromium.org

[jrummell, 2014-10-17 01:09:55]

PTAL. Updates the content_browsertests as well this time. No other changes from
the previous CL (https://codereview.chromium.org/641443002/).

[ddorwin, 2014-10-17 01:34:16]

content/ LGTM. The reland of everything else rsLGTM.

[jrummell, 2014-10-20 17:35:34]

The CQ bit was checked by jrummell@chromium.org

[commit-bot: I haz the power, 2014-10-20 17:36:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/642813012/20001

[commit-bot: I haz the power, 2014-10-20 18:44:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-20 18:44:38]

Failed to apply patch for media/test/data/eme_player_js/player_utils.js:
While running git apply --index -3 -p1;
  error: patch failed: media/test/data/eme_player_js/player_utils.js:57
  Falling back to three-way merge...
  Applied patch to 'media/test/data/eme_player_js/player_utils.js' with
conflicts.
  U media/test/data/eme_player_js/player_utils.js

Patch:       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
16f3de6c5d86d60cc1dad0191bac56078f7b4253..4594c8e2e08f8bd167ae1b39958774cb0ceb4b7b
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); });
+      } 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);

[commit-bot: I haz the power, 2014-10-20 18:46:15]

The CQ bit was unchecked by commit-bot@chromium.org

[jrummell, 2014-10-20 23:58:10]

Patchset #3 (id:40001) has been deleted

[jrummell, 2014-10-21 00:01:18]

The CQ bit was checked by jrummell@chromium.org

[commit-bot: I haz the power, 2014-10-21 00:04:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/642813012/60001

[commit-bot: I haz the power, 2014-10-21 02:08:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-21 02:08:46]

Exceeded time limit waiting for builds to trigger.

[jrummell, 2014-10-21 16:55:57]

The CQ bit was checked by jrummell@chromium.org

[commit-bot: I haz the power, 2014-10-21 16:56:57]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/642813012/60001

[commit-bot: I haz the power, 2014-10-21 17:55:40]

Committed patchset #3 (id:60001)

[commit-bot: I haz the power, 2014-10-21 17:56:36]

Patchset 3 (id:??) landed as
https://crrev.com/c467d23a1853a9c740fd20cf96766e9540af50e7
Cr-Commit-Position: refs/heads/master@{#300519}