Integrate browser tests with new EME player.

chrome/test/data/media/eme_player_js/player.js

Index: chrome/test/data/media/eme_player_js/player.js
diff --git a/chrome/test/data/media/eme_player_js/player.js b/chrome/test/data/media/eme_player_js/player.js
index 64c3b7bb13714f1dd04276877e3ec9511f9a7d65..5317a5eb068bfb18db091c8dbda47bc67de9e30d 100644
--- a/chrome/test/data/media/eme_player_js/player.js
+++ b/chrome/test/data/media/eme_player_js/player.js
@@ -14,6 +14,7 @@ function InitPlayer(player, video) {
     'webkitneedkey': 'onWebkitNeedKey',
     'webkitkeymessage': 'onWebkitKeyMessage',
     'webkitkeyadded': 'onWebkitKeyAdded',
+    'webkitkeyerror': 'onWebkitKeyError',
     'error': 'onError',
     'abort': 'onAbort'
   };
@@ -48,11 +49,19 @@ function InitEMEPlayer(player, video) {
       var mediaKeySession = message.target.mediaKeys.createSession(
           message.contentType, message.initData);
       mediaKeySession.addEventListener('message', player.onMessage);
+      mediaKeySession.addEventListener('message', function(message) {
+        video.receivedKeyMessage = true;
+        if (Utils.isHeartBeatMessage(message.message)) {
+          Utils.timeLog('MediaKeySession onMessage - heart beat', message);
+          video.receivedHeartbeat = true;
+          return;

[jrummell, 2014/05/29 21:45:05]

The return is not really necessary.

[shadi, 2014/05/31 00:31:37]

Done.

+        }
+      });
       mediaKeySession.addEventListener('error', function(error) {
-        Utils.failTest(error);
+        Utils.failTest(error, KEY_ERROR);
       });
-    } catch (e) {
-      Utils.failTest(e);
+    } catch (error) {

[ddorwin, 2014/05/30 17:42:56]

This is really an "exception". I think "e" is probably used like this commonly
enough for this to be okay, but I'm not familiar with the JS style.

This is also a little confusing with error at 60-61.

[shadi, 2014/05/31 00:31:37]

Done.

+      Utils.failTest(error);
     }
   };
 
@@ -69,14 +78,33 @@ function InitPrefixedEMEPlayer(player, video) {
   player.onWebkitNeedKey = function(message) {
     Utils.timeLog(TestConfig.keySystem + ' Generate key request, initData: ' +
                   Utils.getHexString(message.initData));
-    message.target.webkitGenerateKeyRequest(
-        TestConfig.keySystem, message.initData);
+    try {
+      message.target.webkitGenerateKeyRequest(
+          TestConfig.keySystem, message.initData);
+    } catch(error) {
+      Utils.failTest(error);
+    }
   };
 
   player.onWebkitKeyAdded = function(message) {
     Utils.timeLog('onWebkitKeyAdded', message);
-    message.target.hasKeyAdded = true;
+    message.target.receivedKeyAdded = true;
   };
 
+  video.addEventListener('webkitkeyerror', function(error) {

[jrummell, 2014/05/29 21:45:05]

Curious why some events are done as play.onWebKitxxx (2 above) while the 2 new
ones are done by registering the event handler directly. Shouldn't they be done
the same way?

[shadi, 2014/05/31 00:31:37]

The disadvantage of using player.[event_name] here is that it would replace
whatever is defined in the player class (in prefixed_clearkey_player.js for
example). However, adding a video.event listener would still call the
player.event listener as well. 

For example, here 'webkitkeymessage' event listener sets receivedKeyMessage and
receivedHeartbeat flags for video in any prefixed clear player, even though
webkitAddKey gets handled in the player.onWebkitKeyMessage() function for each
of prefixed_clearkey_player and prefixed_widevine_player. 

Having said that, I agree it is confusing. I am going to stick to video event
listeners here unless there is a good need not to.

+    Utils.timeLog('onWebkitKeyError', error);
+    Utils.failTest(error, KEY_ERROR);
+  });
+
+  video.addEventListener('webkitkeymessage', function(message) {
+    Utils.timeLog('onWebkitKeyMessage', message);
+    message.target.receivedKeyMessage = true;
+    if (Utils.isHeartBeatMessage(message.message)) {
+      Utils.timeLog('onWebkitKeyMessage - heart beat', message);
+      message.target.receivedHeartbeat = true;
+      return;
+    }
+  });
+
   InitPlayer(player, video);
 }