Reland: Enable media browsertests on Android

content/browser/media/media_color_browsertest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/test_data_util.h"
 
 namespace content {
 
 class MediaColorTest : public MediaBrowserTest {
  public:
   void RunColorTest(const std::string& video_file) {
     base::FilePath path = media::GetTestDataFilePath("blackwhite.html");
     std::string final_title =
         RunTest(GetFileUrlWithQuery(path, video_file), kEnded);
     EXPECT_EQ(kEnded, final_title);
   }
 };
 
+// Android doesn't support Theora.
+#if !defined(OS_ANDROID)
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pTheora) {
   RunColorTest("yuv420p.ogv");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv422pTheora) {
   RunColorTest("yuv422p.ogv");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pTheora) {
   RunColorTest("yuv444p.ogv");
 }
+#endif  // !defined(OS_ANDROID)
 
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pVp8) {
   RunColorTest("yuv420p.webm");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pVp9) {
   RunColorTest("yuv444p.webm");
 }
 
 #if defined(USE_PROPRIETARY_CODECS)
-IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pH264) {
+
+// This fails on some Android devices: http://crbug.com/649199,
+// http://crbug.com/649185.
+#if defined(OS_ANDROID)
+#define MAYBE_Yuv420pH264 DISABLED_Yuv420pH264
+#else
+#define MAYBE_Yuv420pH264 Yuv420pH264
+#endif
+IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuv420pH264) {
   RunColorTest("yuv420p.mp4");
 }
 
-// This test fails on Android http://crbug.com/647818, and OSX
+// This test fails on Android: http://crbug.com/647818, and OSX:
 // http://crbug.com/647838.
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
 #define MAYBE_Yuvj420pH264 DISABLED_Yuvj420pH264
 #else
 #define MAYBE_Yuvj420pH264 Yuvj420pH264
 #endif
 IN_PROC_BROWSER_TEST_F(MediaColorTest, MAYBE_Yuvj420pH264) {
   RunColorTest("yuvj420p.mp4");
 }
 
-// This fails on Linux & ChromeOS http://crbug.com/647400, and Windows
-// http://crbug.com/647842.
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
+// This fails on Linux & ChromeOS: http://crbug.com/647400,
+// Windows: http://crbug.com/647842, and Android: http://crbug.com/649199,
+// http://crbug.com/649185.
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
+    defined(OS_ANDROID)
 #define MAYBE_Yuv420pRec709H264 DISABLED_Yuv420pRec709H264
 #else
 #define MAYBE_Yuv420pRec709H264 Yuv420pRec709H264
 #endif
 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");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv422pH264) {
   RunColorTest("yuv422p.mp4");
 }
 
 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) {
   RunColorTest("yuv420p.avi");
 }
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 }  // namespace content