Fix/Disable ffmpeg Media Tests on Android

media/base/test_helpers.h

Index: media/base/test_helpers.h
diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h
index afad1f739615a65d2fc4572b2ccf6b190d7c4d12..712680b0c0f723c1d862eb476f7782a0ab4e7c7c 100644
--- a/media/base/test_helpers.h
+++ b/media/base/test_helpers.h
@@ -18,6 +18,7 @@
 #include "media/base/media_log.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/sample_format.h"
+#include "media/base/video_codecs.h"
 #include "media/base/video_decoder_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/geometry/size.h"
@@ -83,13 +84,13 @@ class TestVideoConfig {
   // Returns a configuration that is invalid.
   static VideoDecoderConfig Invalid();
 
-  static VideoDecoderConfig Normal();
+  static VideoDecoderConfig Normal(VideoCodec codec = kCodecVP8);
   static VideoDecoderConfig NormalH264();
-  static VideoDecoderConfig NormalEncrypted();
+  static VideoDecoderConfig NormalEncrypted(VideoCodec codec = kCodecVP8);
 
   // Returns a configuration that is larger in dimensions than Normal().
-  static VideoDecoderConfig Large();
-  static VideoDecoderConfig LargeEncrypted();
+  static VideoDecoderConfig Large(VideoCodec codec = kCodecVP8);
+  static VideoDecoderConfig LargeEncrypted(VideoCodec codec = kCodecVP8);
 
   // Returns coded size for Normal and Large config.
   static gfx::Size NormalCodedSize();