Enable AudioDecoder unit tests on Android

media/base/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
@@ skipping 377 matching lines @@
     "audio_renderer_mixer_unittest.cc",
     "audio_shifter_unittest.cc",
     "audio_splicer_unittest.cc",
     "audio_timestamp_helper_unittest.cc",
     "bind_to_current_loop_unittest.cc",
     "bit_reader_unittest.cc",
     "callback_holder.h",
     "callback_holder_unittest.cc",
     "channel_mixer_unittest.cc",
     "channel_mixing_matrix_unittest.cc",
-    "container_names_unittest.cc",
     "data_buffer_unittest.cc",
     "decoder_buffer_queue_unittest.cc",
     "decoder_buffer_unittest.cc",
     "djb2_unittest.cc",
     "fake_demuxer_stream_unittest.cc",
     "gmock_callback_support_unittest.cc",
     "key_systems_unittest.cc",
     "mime_util_unittest.cc",
     "moving_average_unittest.cc",
     "multi_channel_resampler_unittest.cc",
@@ skipping 24 matching lines @@
   ]
   deps = [
     ":test_support",
     "//gpu/command_buffer/common",
     "//media",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
+  if (media_use_ffmpeg) {

[DaleCurtis, 2016/02/29 23:17:46]

This doesn't require ffmpeg, why the move?

[Tima Vaisburd, 2016/03/01 00:14:22]

Because container_names.h and .cc are conditionally included, see l.233.   I
think the current code does not compile with media_use_ffmpeg=false.

I did not see anything in container_names.* that requires ffmpeg though. Shall
we include them unconditionally?

[DaleCurtis, 2016/03/01 00:16:37]

Yes you should be able to include them unconditionally.

[Tima Vaisburd, 2016/03/01 00:48:55]

Done.

+    sources += [ "container_names_unittest.cc" ]
+  }
+
   # Even if FFmpeg is enabled on Android we don't want these.
   # TODO(watk): Refactor tests that could be made to run on Android.
   if (media_use_ffmpeg && !is_android) {
     sources += [
       "audio_video_metadata_extractor_unittest.cc",
       "media_file_checker_unittest.cc",
     ]
   }
 
   if (is_android) {
@@ skipping 96 matching lines @@
 }
 
 fuzzer_test("media_container_names_fuzzer") {
   sources = [
     "container_names_fuzzertest.cc",
   ]
   deps = [
     "//media",
   ]
 }