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 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 // Following tests fail if Widevine is loaded as a component, crbug.com/356833. | 506 // Following tests fail if Widevine is loaded as a component, crbug.com/356833. |
507 #if !defined(WIDEVINE_CDM_IS_COMPONENT) | 507 #if !defined(WIDEVINE_CDM_IS_COMPONENT) |
508 INSTANTIATE_TEST_CASE_P(MSE_Widevine, | 508 INSTANTIATE_TEST_CASE_P(MSE_Widevine, |
509 EncryptedMediaTest, | 509 EncryptedMediaTest, |
510 Combine(Values(kWidevineKeySystem), | 510 Combine(Values(kWidevineKeySystem), |
511 Values(MSE), | 511 Values(MSE), |
512 Values(UNPREFIXED))); | 512 Values(UNPREFIXED))); |
513 #endif // !defined(WIDEVINE_CDM_IS_COMPONENT) | 513 #endif // !defined(WIDEVINE_CDM_IS_COMPONENT) |
514 #endif // defined(WIDEVINE_CDM_AVAILABLE) | 514 #endif // defined(WIDEVINE_CDM_AVAILABLE) |
515 | 515 |
516 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) { | 516 // http://crbug.com/402766 |
| 517 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_Playback_AudioOnly_WebM) { |
517 TestSimplePlayback("bear-a_enc-a.webm", kWebMAudioOnly); | 518 TestSimplePlayback("bear-a_enc-a.webm", kWebMAudioOnly); |
518 } | 519 } |
519 | 520 |
520 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) { | 521 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) { |
521 TestSimplePlayback("bear-320x240-av_enc-a.webm", kWebMAudioVideo); | 522 TestSimplePlayback("bear-320x240-av_enc-a.webm", kWebMAudioVideo); |
522 } | 523 } |
523 | 524 |
524 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM) { | 525 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM) { |
525 TestSimplePlayback("bear-320x240-av_enc-av.webm", kWebMAudioVideo); | 526 TestSimplePlayback("bear-320x240-av_enc-av.webm", kWebMAudioVideo); |
526 } | 527 } |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
660 "bear-320x240-v_enc-v.webm", | 661 "bear-320x240-v_enc-v.webm", |
661 kWebMVideoOnly, | 662 kWebMVideoOnly, |
662 kExternalClearKeyKeySystem, | 663 kExternalClearKeyKeySystem, |
663 SRC, | 664 SRC, |
664 PREFIXED, | 665 PREFIXED, |
665 kUnknownSession, | 666 kUnknownSession, |
666 false, | 667 false, |
667 kEmeKeyError); | 668 kEmeKeyError); |
668 } | 669 } |
669 #endif // defined(ENABLE_PEPPER_CDMS) | 670 #endif // defined(ENABLE_PEPPER_CDMS) |
OLD | NEW |