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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
519 } | 519 } |
520 | 520 |
521 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) { | 521 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) { |
522 TestSimplePlayback("bear-320x240-av_enc-a.webm", kWebMAudioVideo); | 522 TestSimplePlayback("bear-320x240-av_enc-a.webm", kWebMAudioVideo); |
523 } | 523 } |
524 | 524 |
525 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM) { | 525 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM) { |
526 TestSimplePlayback("bear-320x240-av_enc-av.webm", kWebMAudioVideo); | 526 TestSimplePlayback("bear-320x240-av_enc-av.webm", kWebMAudioVideo); |
527 } | 527 } |
528 | 528 |
529 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { | 529 // http://crbug.com/402766 |
| 530 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_Playback_VideoOnly_WebM) { |
530 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly); | 531 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly); |
531 } | 532 } |
532 | 533 |
533 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { | 534 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { |
534 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); | 535 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); |
535 } | 536 } |
536 | 537 |
537 // http://crbug.com/402766 | 538 // http://crbug.com/402766 |
538 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_Playback_VP9Video_WebM) { | 539 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_Playback_VP9Video_WebM) { |
539 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); | 540 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
661 "bear-320x240-v_enc-v.webm", | 662 "bear-320x240-v_enc-v.webm", |
662 kWebMVideoOnly, | 663 kWebMVideoOnly, |
663 kExternalClearKeyKeySystem, | 664 kExternalClearKeyKeySystem, |
664 SRC, | 665 SRC, |
665 PREFIXED, | 666 PREFIXED, |
666 kUnknownSession, | 667 kUnknownSession, |
667 false, | 668 false, |
668 kEmeKeyError); | 669 kEmeKeyError); |
669 } | 670 } |
670 #endif // defined(ENABLE_PEPPER_CDMS) | 671 #endif // defined(ENABLE_PEPPER_CDMS) |
OLD | NEW |