Verify heartbeat messages have type 'license-renewal'

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 b288297b6c0e134cc63d43920e68fb34c9061384..be1f69bb0e8efdc7d4e97c5c206b7600df1c4f4e 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -44,9 +44,14 @@ PlayerUtils.registerEMEEventListeners = function(player) {
     function addMediaKeySessionListeners(mediaKeySession) {
       mediaKeySession.addEventListener('message', function(message) {
         player.video.receivedKeyMessage = true;
-        if (Utils.isHeartBeatMessage(message.message)) {
+        if (Utils.isHeartBeatMessage(message)) {

[ddorwin, 2015/01/14 23:24:52]

Rename isRenewalMessage?
"Heartbeat" isn't a concept in the spec, so we should prefer one that is
(renewal). We should probably change all other occurrences as well.

[jrummell, 2015/01/15 01:32:56]

Done.

           Utils.timeLog('MediaKeySession onMessage - heart beat', message);
           player.video.receivedHeartbeat = true;
+        } else {
+          if (message.messageType != 'license-request') {
+            Utils.failTest('non-heart beat message is not license-request',

[ddorwin, 2015/01/14 23:24:52]

'Unexpected message type "' message.messageType '" received.'

[jrummell, 2015/01/15 01:32:56]

Done.

+                           KEY_ERROR);
+          }
         }
         player.onMessage(message);
       });
@@ -123,7 +128,7 @@ PlayerUtils.registerPrefixedEMEEventListeners = function(player) {
   player.video.addEventListener('webkitkeymessage', function(message) {
     Utils.timeLog('onWebkitKeyMessage', message);
     message.target.receivedKeyMessage = true;
-    if (Utils.isHeartBeatMessage(message.message)) {
+    if (Utils.isHeartBeatMessagePrefixed(message.message)) {
       Utils.timeLog('onWebkitKeyMessage - heart beat', message);
       message.target.receivedHeartbeat = true;
     }