| 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 99c16a089111a9c993bcc472565470114a014656..5612e0ce8420fa88526e64ae1375c52a3a64bd22 100644
|
| --- a/chrome/browser/media/encrypted_media_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc
|
| @@ -40,6 +40,8 @@ const char kExternalClearKeyFileIOTestKeySystem[] =
|
| "org.chromium.externalclearkey.fileiotest";
|
| const char kExternalClearKeyInitializeFailKeySystem[] =
|
| "org.chromium.externalclearkey.initializefail";
|
| +const char kExternalClearKeyCrashKeySystem[] =
|
| + "org.chromium.externalclearkey.crash";
|
|
|
| // Supported media types.
|
| const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
|
| @@ -400,6 +402,16 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) {
|
| kEmeKeyError);
|
| }
|
|
|
| +// When CDM crashes, we should still get a decode error.
|
| +IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMCrashDuringDecode) {
|
| + RunEncryptedMediaTest("encrypted_media_player.html",
|
| + "bear-a-enc_a.webm",
|
| + kWebMAudioOnly,
|
| + kExternalClearKeyCrashKeySystem,
|
| + SRC,
|
| + kError);
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) {
|
| RunEncryptedMediaTest("encrypted_media_player.html",
|
| "bear-a-enc_a.webm",
|
|
|