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

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 2426813002: EME: Close existing sessions on CDM failure (Closed)
Patch Set: add test Created 4 years, 2 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
Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index af786a4f47d9ca8dc21e654d0fd2015549da9716..2a47d7ea82e130a1ad7b59a4133874cd5fa20092 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -81,6 +81,7 @@ const char kEmeUpdateFailed[] = "EME_UPDATE_FAILED";
const char kEmeErrorEvent[] = "EME_ERROR_EVENT";
const char kEmeMessageUnexpectedType[] = "EME_MESSAGE_UNEXPECTED_TYPE";
const char kEmeRenewalMissingHeader[] = "EME_RENEWAL_MISSING_HEADER";
+const char kEmeSessionClosed[] = "SESSION_CLOSED";
const char kDefaultEmePlayer[] = "eme_player.html";
@@ -613,19 +614,17 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) {
kEmeNotSupportedError);
}
-// When CDM crashes, we should still get a decode error. |kError| is reported
-// when the HTMLVideoElement error event fires, indicating an error happened
-// during playback.
+// When CDM crashes, all open sessions should be closed.
IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMCrashDuringDecode) {
IgnorePluginCrash();
- TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError);
+ TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kEmeSessionClosed);
}
// Testing that the media browser test does fail on plugin crash.
IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMExpectedCrash) {
// Plugin crash is not ignored by default, the test is expected to fail.
EXPECT_NONFATAL_FAILURE(
- TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError),
+ TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kEmeSessionClosed),
"Failing test due to plugin crash.");
}
« no previous file with comments | « no previous file | content/renderer/pepper/content_decryptor_delegate.h » ('j') | media/test/data/eme_player_js/player_utils.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698