| 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 e82276ec5629498d8245d60d1001524e8d94a6dd..920b4e2eefc751f9e215bdc64b976156911b046e 100644
|
| --- a/chrome/browser/media/encrypted_media_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "content/public/test/browser_test_utils.h"
|
| +#include "testing/gtest/include/gtest/gtest-spi.h"
|
| #if defined(OS_ANDROID)
|
| #include "base/android/build_info.h"
|
| #endif
|
| @@ -626,9 +627,18 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) {
|
|
|
| // When CDM crashes, we should still get a decode error.
|
| IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMCrashDuringDecode) {
|
| + IgnorePluginCrash();
|
| TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError);
|
| }
|
|
|
| +// 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),
|
| + "plugin crash");
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) {
|
| TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem,
|
| kFileIOTestSuccess);
|
|
|