| Index: content/browser/media/media_color_browsertest.cc
|
| diff --git a/content/browser/media/media_color_browsertest.cc b/content/browser/media/media_color_browsertest.cc
|
| index 33f0b79c0ad7e397ab0d46e0bf50e16fb57cb60a..9590a36a40512a3f8e7690a22d57d6569127d4f5 100644
|
| --- a/content/browser/media/media_color_browsertest.cc
|
| +++ b/content/browser/media/media_color_browsertest.cc
|
| @@ -19,6 +19,8 @@ class MediaColorTest : public MediaBrowserTest {
|
| }
|
| };
|
|
|
| +// Android doesn't support Theora.
|
| +#if !defined(OS_ANDROID)
|
| IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pTheora) {
|
| RunColorTest("yuv420p.ogv");
|
| }
|
| @@ -30,6 +32,7 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv422pTheora) {
|
| IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pTheora) {
|
| RunColorTest("yuv444p.ogv");
|
| }
|
| +#endif // !defined(OS_ANDROID)
|
|
|
| IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pVp8) {
|
| RunColorTest("yuv420p.webm");
|
| @@ -66,6 +69,8 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuv420pRec709H264) {
|
| RunColorTest("yuv420p_rec709.mp4");
|
| }
|
|
|
| +// Android devices usually only support baseline, main and high.
|
| +#if !defined(OS_ANDROID)
|
| IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pHighBitDepth) {
|
| RunColorTest("yuv420p_hi10p.mp4");
|
| }
|
| @@ -77,6 +82,7 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv422pH264) {
|
| IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pH264) {
|
| RunColorTest("yuv444p.mp4");
|
| }
|
| +#endif // !defined(OS_ANDROID)
|
|
|
| #if defined(OS_CHROMEOS)
|
| IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pMpeg4) {
|
|
|