Fix/Disable ffmpeg Media Tests on Android

media/base/test_helpers.cc

Index: media/base/test_helpers.cc
diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc
index 2a0c3211293e6709d86de955fbdc2c015d16e075..31956fd7aa03c24f96df53c609e40894f2a43924 100644
--- a/media/base/test_helpers.cc
+++ b/media/base/test_helpers.cc
@@ -25,6 +25,14 @@ using ::testing::StrictMock;
 
 namespace media {
 
+namespace {
+#if defined(OS_ANDROID)
+VideoCodec kDefaultCodec = kCodecH264;
+#else
+VideoCodec kDefaultCodec = kCodecVP8;
+#endif
+}  // anonymous namespace
+
 // Utility mock for testing methods expecting Closures and PipelineStatusCBs.
 class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
  public:
@@ -148,7 +156,7 @@ VideoDecoderConfig TestVideoConfig::Invalid() {
 
 // static
 VideoDecoderConfig TestVideoConfig::Normal() {

[watk, 2017/05/09 22:08:23]

Instead of this kDefaultCodec, I think it would be better if these had a codec
parameter which is defaulted to vp8.

-  return GetTestConfig(kCodecVP8, kNormalSize, false);
+  return GetTestConfig(kDefaultCodec, kNormalSize, false);
 }
 
 // static
@@ -158,17 +166,17 @@ VideoDecoderConfig TestVideoConfig::NormalH264() {
 
 // static
 VideoDecoderConfig TestVideoConfig::NormalEncrypted() {
-  return GetTestConfig(kCodecVP8, kNormalSize, true);
+  return GetTestConfig(kDefaultCodec, kNormalSize, true);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::Large() {
-  return GetTestConfig(kCodecVP8, kLargeSize, false);
+  return GetTestConfig(kDefaultCodec, kLargeSize, false);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::LargeEncrypted() {
-  return GetTestConfig(kCodecVP8, kLargeSize, true);
+  return GetTestConfig(kDefaultCodec, kLargeSize, true);
 }
 
 // static