Verify heartbeat messages have type 'license-renewal'

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 26 matching lines @@
 };
 
 // Register the necessary event handlers needed when playing encrypted content
 // using the unprefixed API. Returns a promise that resolves to the player.
 PlayerUtils.registerEMEEventListeners = function(player) {
   player.video.addEventListener('encrypted', function(message) {
 
     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);
       });
       mediaKeySession.addEventListener('error', function(error) {
         Utils.failTest(error, KEY_ERROR);
       });
     }
 
     try {
       if (player.testConfig.sessionToLoad) {
@@ skipping 56 matching lines @@
   });
 
   player.video.addEventListener('webkitkeyerror', function(error) {
     Utils.timeLog('onWebkitKeyError', error);
     Utils.failTest(error, KEY_ERROR);
   });
 
   player.video.addEventListener('webkitkeymessage', function(message) {
     Utils.timeLog('onWebkitKeyMessage', message);
     message.target.receivedKeyMessage = true;
     if (Utils.isHeartBeatMessage(message.message)) {

[ddorwin, 2015/01/15 03:31:51]

I meant we should rename this one too since "heartbeat" isn't a concept in
either (omitted in my comment) spec. So, s/heartbeat/renewal/ so we are using
the concrete concept from the current spec. That should be a much simpler change
in the HTML file.

[jrummell, 2015/01/15 19:37:59]

Done.

       Utils.timeLog('onWebkitKeyMessage - heart beat', message);
       message.target.receivedHeartbeat = true;
     }
   });
 
   // The prefixed API is all synchronous, so wrap the calls in a promise.
   return new Promise(function(resolve, reject) {
     PlayerUtils.registerDefaultEventListeners(player);
     resolve(player);
   });
@@ skipping 47 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);
 };