Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Unified Diff: media/test/data/eme_player.html

Issue 2267283002: media: Separate renewal from default External Clear Key test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/test/data/eme_player_js/globals.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/data/eme_player.html
diff --git a/media/test/data/eme_player.html b/media/test/data/eme_player.html
index 2d44874dc7203d57160aa57fc49bc621077ba556..3e8453867435c709453a9e9777e896818cbdf6b0 100644
--- a/media/test/data/eme_player.html
+++ b/media/test/data/eme_player.html
@@ -74,16 +74,14 @@
Utils.timeLog('timeupdate @ ' + video.currentTime);
if (video.currentTime < 1)
return;
- // For loadSession() tests, addKey() will not be called after
- // loadSession() (the key is loaded internally). Do not check keyadded
- // and renewal message for these tests.
- if (!testConfig.sessionToLoad) {
- // keyadded may be fired around the start of playback; check for it
- // after a delay to avoid timing issues.
- if (testConfig.keySystem == EXTERNAL_CLEARKEY &&
- !video.receivedRenewalMessage)
- Utils.failTest('license-renewal message not received.');
+
+ // Renewal message may be fired around the start of playback; check for it
+ // after a delay to avoid timing issues.
+ if (testConfig.keySystem == EXTERNAL_CLEARKEY_RENEWAL &&
+ !video.receivedRenewalMessage) {
+ Utils.failTest('license-renewal message not received.');
}
+
Utils.timeLog('waiting for video to end.');
video.removeEventListener('ended', Utils.failTest);
Utils.installTitleEventHandler(video, 'ended');
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/test/data/eme_player_js/globals.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698