Enable AudioDecoder unit tests on Android

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 02a4917fe592b72db617c9f4db3a61aed7acfeab..acae2f0393f34fa44e7c484491101e2831bff612 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -735,6 +735,14 @@ test("media_unittests") {
     data_deps += [ "//media/cdm/ppapi:clearkeycdm" ]
   }
 
+  if (media_use_ffmpeg || is_android) {

[DaleCurtis, 2016/02/26 23:31:42]

Just add the file after l.751

[Tima Vaisburd, 2016/02/29 23:07:14]

Done. This makes audio_decoder_unittest available on Android only if
media_use_ffmpeg is set, and on Android these test do not require ffmpeg at all!
I hope I understood your intention correctly.

+    sources += [
+      # This file disables FFmpeg decoder tests on Android.
+      # FFmpeg tests should be eventially reenabled, http://crbug.com/570762.
+      "filters/audio_decoder_unittest.cc",
+    ]
+  }
+
   if (media_use_ffmpeg) {
     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
@@ -748,7 +756,6 @@ test("media_unittests") {
         # These tests are confused by Android always having proprietary
         # codecs enabled, but ffmpeg_branding=Chromium.  These should be
         # fixed, http://crbug.com/570762.
-        "filters/audio_decoder_unittest.cc",
         "filters/audio_file_reader_unittest.cc",
         "filters/ffmpeg_demuxer_unittest.cc",