OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "base/win/windows_version.h" | 9 #include "base/win/windows_version.h" |
10 #include "chrome/browser/media/media_browsertest.h" | 10 #include "chrome/browser/media/media_browsertest.h" |
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 kEmeNotSupportedError); | 619 kEmeNotSupportedError); |
620 } | 620 } |
621 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 621 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
622 | 622 |
623 #if defined(ENABLE_PEPPER_CDMS) | 623 #if defined(ENABLE_PEPPER_CDMS) |
624 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) { | 624 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) { |
625 TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem, kEmeKeyError); | 625 TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem, kEmeKeyError); |
626 } | 626 } |
627 | 627 |
628 // When CDM crashes, we should still get a decode error. | 628 // When CDM crashes, we should still get a decode error. |
629 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMCrashDuringDecode) { | 629 // crbug.com/386657 |
| 630 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMCrashDuringDecode) { |
630 IgnorePluginCrash(); | 631 IgnorePluginCrash(); |
631 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError); | 632 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError); |
632 } | 633 } |
633 | 634 |
634 // Testing that the media browser test does fail on plugin crash. | 635 // Testing that the media browser test does fail on plugin crash. |
635 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMExpectedCrash) { | 636 // crbug.com/386657 |
| 637 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMExpectedCrash) { |
636 // Plugin crash is not ignored by default, the test is expected to fail. | 638 // Plugin crash is not ignored by default, the test is expected to fail. |
637 EXPECT_NONFATAL_FAILURE( | 639 EXPECT_NONFATAL_FAILURE( |
638 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError), | 640 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError), |
639 "plugin crash"); | 641 "plugin crash"); |
640 } | 642 } |
641 | 643 |
642 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) { | 644 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) { |
643 TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, | 645 TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, |
644 kFileIOTestSuccess); | 646 kFileIOTestSuccess); |
645 } | 647 } |
(...skipping 16 matching lines...) Expand all Loading... |
662 "bear-320x240-v-enc_v.webm", | 664 "bear-320x240-v-enc_v.webm", |
663 kWebMVideoOnly, | 665 kWebMVideoOnly, |
664 kExternalClearKeyKeySystem, | 666 kExternalClearKeyKeySystem, |
665 SRC, | 667 SRC, |
666 PREFIXED, | 668 PREFIXED, |
667 kUnknownSession, | 669 kUnknownSession, |
668 false, | 670 false, |
669 kEmeKeyError); | 671 kEmeKeyError); |
670 } | 672 } |
671 #endif // defined(ENABLE_PEPPER_CDMS) | 673 #endif // defined(ENABLE_PEPPER_CDMS) |
OLD | NEW |