Update eme_player to handle MediaKeySession.generateRequest()

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 @@
       });
       mediaKeySession.addEventListener('error', function(error) {
         Utils.failTest(error, KEY_ERROR);
       });
     }
 
     Utils.timeLog('Creating new media key session for contentType: ' +
                   message.contentType + ', initData: ' +
                   Utils.getHexString(message.initData));
     try {
-      var session = message.target.mediaKeys.createSession(
-          message.contentType, message.initData);
-      if (PROMISES_SUPPORTED) {
-        session.then(addMediaKeySessionListeners)
-            .catch (function(error) {
-              Utils.failTest(error, KEY_ERROR);
-            });
+      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(message.contentType, message.initData)
+          .catch (function(error) {

[ddorwin, 2014/09/08 17:50:09]

remove the space here and below

[jrummell, 2014/09/08 18:21:05]

Done. Note that clang-format wants to put the space back in.

+            Utils.failTest(error, KEY_ERROR);

[ddorwin, 2014/09/08 17:50:09]

What is KEY_ERROR? Why do these all fail with that? Is this because the browser
tests don't differentiate more than this?

[jrummell, 2014/09/08 18:21:05]

KEY_ERROR is simply the string "KEY_ERROR". It is used since the tests simply
check the title when the test is finished to see if it succeeded or not.
(https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/med...)

+          });
       } else {
-        addMediaKeySessionListeners(session);
+        var session = message.target.mediaKeys.createSession(
+            message.contentType, message.initData);
+        if (PROMISES_SUPPORTED) {

[ddorwin, 2014/09/08 17:50:09]

Can we remove this now? Probably in a separate CL before this one.

[jrummell, 2014/09/08 18:21:05]

Yes. However, this test is done in several files, so I figured there would be
one cleanup pass after all the changes have been made.

+          session.then(addMediaKeySessionListeners)
+              .catch (function(error) {
+                Utils.failTest(error, KEY_ERROR);
+              });
+        } else {
+          addMediaKeySessionListeners(session);
+        }
       }
     } catch (e) {
       Utils.failTest(e);
     }
   });
   this.registerDefaultEventListeners(player);
   try {
     Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem);
     if (PROMISES_SUPPORTED) {
       MediaKeys.create(player.testConfig.keySystem).then(function(mediaKeys) {
@@ skipping 98 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);
 };