diff options
Diffstat (limited to 'chromium/content/browser/media/media_browsertest.cc')
| -rw-r--r-- | chromium/content/browser/media/media_browsertest.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/chromium/content/browser/media/media_browsertest.cc b/chromium/content/browser/media/media_browsertest.cc index a29d792d29b..df13b63bd37 100644 --- a/chromium/content/browser/media/media_browsertest.cc +++ b/chromium/content/browser/media/media_browsertest.cc @@ -167,6 +167,26 @@ class MediaTest : public testing::WithParamInterface<bool>, } }; +#if defined(OS_ANDROID) +class AndroidPlayerMediaTest : public MediaTest { + private: + void SetUpCommandLine(base::CommandLine* command_line) override { + MediaTest::SetUpCommandLine(command_line); + command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); + } +}; + +// TODO(crbug.com/1094571): Flaky. +IN_PROC_BROWSER_TEST_P(AndroidPlayerMediaTest, DISABLED_VideoBearMp4) { + PlayVideo("bear.mp4", GetParam()); +} + +INSTANTIATE_TEST_SUITE_P(File, + AndroidPlayerMediaTest, + ::testing::Values(false)); +INSTANTIATE_TEST_SUITE_P(Http, AndroidPlayerMediaTest, ::testing::Values(true)); +#endif // defined(OS_ANDROID) + // Android doesn't support Theora. #if !defined(OS_ANDROID) IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) { |