EME: Close existing sessions on CDM failure

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 10 matching lines @@
     var eventListenerFunction = player[eventListenerMap[eventName]];
     if (eventListenerFunction) {
       player.video.addEventListener(eventName, function(e) {
         player[eventListenerMap[e.type]](e);
       });
     }
   }
 
   player.video.addEventListener('error', function(error) {
     // This most likely happens on pipeline failures (e.g. when the CDM
-    // crashes).
+    // crashes). Don't report a failure if the test is expecting a crash.
     Utils.timeLog('onHTMLElementError', error);
-    Utils.failTest(error);
+    if (player.testConfig.keySystem != 'org.chromium.externalclearkey.crash') {
+      Utils.failTest(error);
+    }
   });
 };
 
 // Register the necessary event handlers needed when playing encrypted content.
 // 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) {
@@ skipping 26 matching lines @@
                 },
                 function(error) { Utils.failTest(error, EME_LOAD_FAILED); });
       } else {
         Utils.timeLog('Creating new media key session for initDataType: ' +
                       message.initDataType + ', initData: ' +
                       Utils.getHexString(new Uint8Array(message.initData)));
         var session = message.target.mediaKeys.createSession();
         addMediaKeySessionListeners(session);
         session.generateRequest(message.initDataType, message.initData)
             .catch(function(error) {
-              // Ignore the error if a crash is expected. This ensures that
-              // the decoder actually detects and reports the error.
-              if (this.testConfig.keySystem !=
+              // If a crash is expected, wait for the session to be closed.

[xhwang, 2016/10/20 22:38:59]

We added the crash test to make sure if the CDM crashes, we'll hit a decode
error on the media element (we had a bug where the pipeline hangs and didn't
report the error before). With this change, are we losing that test coverage?

[jrummell, 2016/11/01 01:08:46]

Yes. Restored the original tests, added 2 new ones.

+              if (this.testConfig.keySystem ==
                   'org.chromium.externalclearkey.crash') {
+                session.closed.then(
+                    function(result) {
+                      Utils.setResultInTitle('SESSION_CLOSED');
+                    },
+                    function(error) { Utils.failTest(error); });
+              } else {
+                // Failure unexpected.
                 Utils.failTest(error, EME_GENERATEREQUEST_FAILED);
               }
             });
       }
     } catch (e) {
       Utils.failTest(e);
     }
   });
 
   this.registerDefaultEventListeners(player);
@@ skipping 110 matching lines @@
       case OUTPUT_PROTECTION_TEST_KEYSYSTEM:
         return UnitTestPlayer;
       default:
         Utils.timeLog(keySystem + ' is not a known key system');
         return ClearKeyPlayer;
     }
   }
   var Player = getPlayerType(testConfig.keySystem);
   return new Player(video, testConfig);
 };