| 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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 } | 548 } |
| 549 | 549 |
| 550 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { | 550 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { |
| 551 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); | 551 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); |
| 552 } | 552 } |
| 553 | 553 |
| 554 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) { | 554 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) { |
| 555 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); | 555 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); |
| 556 } | 556 } |
| 557 | 557 |
| 558 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) { |
| 559 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly); |
| 560 } |
| 561 |
| 562 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { |
| 563 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo); |
| 564 } |
| 565 |
| 566 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) { |
| 567 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); |
| 568 } |
| 569 |
| 558 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) { | 570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) { |
| 559 RunInvalidResponseTest(); | 571 RunInvalidResponseTest(); |
| 560 } | 572 } |
| 561 | 573 |
| 562 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { | 574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { |
| 563 if (CurrentSourceType() != MSE || !IsMSESupported()) { | 575 if (CurrentSourceType() != MSE || !IsMSESupported()) { |
| 564 DVLOG(0) << "Skipping test - ConfigChange test requires MSE."; | 576 DVLOG(0) << "Skipping test - ConfigChange test requires MSE."; |
| 565 return; | 577 return; |
| 566 } | 578 } |
| 567 if (!IsPlayBackPossible(CurrentKeySystem())) { | 579 if (!IsPlayBackPossible(CurrentKeySystem())) { |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 "bear-320x240-v_enc-v.webm", | 715 "bear-320x240-v_enc-v.webm", |
| 704 kWebMVideoOnly, | 716 kWebMVideoOnly, |
| 705 kExternalClearKeyKeySystem, | 717 kExternalClearKeyKeySystem, |
| 706 SRC, | 718 SRC, |
| 707 UNPREFIXED, | 719 UNPREFIXED, |
| 708 kUnknownSession, | 720 kUnknownSession, |
| 709 false, | 721 false, |
| 710 kEmeKeyError); | 722 kEmeKeyError); |
| 711 } | 723 } |
| 712 #endif // defined(ENABLE_PEPPER_CDMS) | 724 #endif // defined(ENABLE_PEPPER_CDMS) |
| OLD | NEW |