diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/browser/media/media_browsertest.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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) { |