| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "content/browser/media/media_browsertest.h" | 6 #include "content/browser/media/media_browsertest.h" |
| 7 #include "content/public/common/content_switches.h" | 7 #include "content/public/common/content_switches.h" |
| 8 #if defined(OS_ANDROID) | 8 #if defined(OS_ANDROID) |
| 9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
| 10 #endif | 10 #endif |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) { | 57 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) { |
| 58 TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded); | 58 TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded); |
| 59 } | 59 } |
| 60 | 60 |
| 61 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoOnly_WebM) { | 61 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoOnly_WebM) { |
| 62 TestSimplePlayback("bear-320x240-video-only.webm", kWebMVideoOnly, kEnded); | 62 TestSimplePlayback("bear-320x240-video-only.webm", kWebMVideoOnly, kEnded); |
| 63 } | 63 } |
| 64 | 64 |
| 65 // Opus is not supported in Android as of now. | 65 // Opus is not supported in Android as of now. |
| 66 #if !defined(OS_ANDROID) | 66 #if !defined(OS_ANDROID) |
| 67 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_Opus_WebM) { | 67 // TODO(dalecurtis): Disabled while the test data file is updated. |
| 68 TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, kEnded); | 68 // IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_Opus_WebM) { |
| 69 } | 69 // TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, kEnded); |
| 70 // } |
| 70 #endif | 71 #endif |
| 71 | 72 |
| 72 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) { | 73 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) { |
| 73 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded); | 74 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded); |
| 74 } | 75 } |
| 75 | 76 |
| 76 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { | 77 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { |
| 77 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, kError); | 78 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, kError); |
| 78 } | 79 } |
| 79 | 80 |
| 80 // Flaky test crbug.com/246308 | 81 // Flaky test crbug.com/246308 |
| 81 // Test changed to skip checks resulting in flakiness. Proper fix still needed. | 82 // Test changed to skip checks resulting in flakiness. Proper fix still needed. |
| 82 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { | 83 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { |
| 83 if (!IsMSESupported()) { | 84 if (!IsMSESupported()) { |
| 84 VLOG(0) << "Skipping test - MSE not supported."; | 85 VLOG(0) << "Skipping test - MSE not supported."; |
| 85 return; | 86 return; |
| 86 } | 87 } |
| 87 RunMediaTestPage("mse_config_change.html", NULL, kEnded, true); | 88 RunMediaTestPage("mse_config_change.html", NULL, kEnded, true); |
| 88 } | 89 } |
| 89 | 90 |
| 90 } // namespace content | 91 } // namespace content |
| OLD | NEW |