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..c317e214bf12e93b071fdf06168c7c7b0a88d815 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,17 @@ 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(true); |
TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError); |
} |
+IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMExpectedCrash) { |
ddorwin
2014/03/21 17:06:29
This is really testing the test framework, right?
shadi1
2014/03/21 18:43:54
Done.
|
+ // Plugin crash is not ignored by defualt, the test is expected to fail. |
+ EXPECT_NONFATAL_FAILURE( |
+ TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError), |
+ "plugin crash"); |
+} |
+ |
IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) { |
TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, |
kFileIOTestSuccess); |