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..60d4b613a34b02b5e6ba629b34eac4832f0de090 100644
--- a/media/test/data/eme_player_js/player_utils.js
+++ b/media/test/data/eme_player_js/player_utils.js
@@ -44,9 +44,15 @@ PlayerUtils.registerEMEEventListeners = function(player) {
     function addMediaKeySessionListeners(mediaKeySession) {
       mediaKeySession.addEventListener('message', function(message) {
         player.video.receivedKeyMessage = true;
-        if (Utils.isHeartBeatMessage(message.message)) {
-          Utils.timeLog('MediaKeySession onMessage - heart beat', message);
-          player.video.receivedHeartbeat = true;
+        if (Utils.isRenewalMessage(message)) {
+          Utils.timeLog('MediaKeySession onMessage - renewal', message);
+          player.video.receivedRenewalMessage = true;
+        } else {
+          if (message.messageType != 'license-request') {
+            Utils.failTest('Unexpected message type "' + message.messageType +
+                               '" received.',
+                           KEY_ERROR);
+          }
         }
         player.onMessage(message);
       });
@@ -123,9 +129,9 @@ PlayerUtils.registerPrefixedEMEEventListeners = function(player) {
   player.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;
+    if (Utils.isRenewalMessagePrefixed(message.message)) {
+      Utils.timeLog('onWebkitKeyMessage - renewal', message);
+      message.target.receivedRenewalMessage = true;
     }
   });