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..869ebbb38bb0b25cd0a049767f0d19e9b24f5016 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -640,6 +640,9 @@ test("media_unittests") {
     "cdm/simple_cdm_buffer.h",
     "filters/audio_clock_unittest.cc",
     "filters/audio_decoder_selector_unittest.cc",
+    "filters/audio_decoder_test.h",
+    "filters/audio_decoder_unittest.cc",
+    "filters/audio_decoder_unittest_chromium.cc",
     "filters/audio_renderer_algorithm_unittest.cc",
     "filters/chunk_demuxer_unittest.cc",
     "filters/decrypting_audio_decoder_unittest.cc",
@@ -743,12 +746,15 @@ test("media_unittests") {
       "filters/in_memory_url_protocol_unittest.cc",
     ]
 
+    if (!is_android || ffmpeg_branding == "Chrome") {

[Tima Vaisburd, 2016/02/26 20:58:48]

On GYP side ffmpeg_branding seems not defined for use in media and for GYP I
exclude audio_decoder_unittest_ffmpeg.cc for every Android build. Shall we do
the same here for simplicity until http://crbug.com/570762 is fixed?

+      sources += [ "filters/audio_decoder_unittest_ffmpeg.cc" ]
+    }
+
     if (!is_android) {
       sources += [
         # 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",