media: Reorganize media unittests

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 370 matching lines @@
     "//base",
     "//base/test:test_support",
     "//media",
     "//media:media_features",
     "//media:shared_memory_support",
     "//testing/gmock",
     "//ui/gfx:test_support",
   ]
 }
 
-source_set("unittests") {
+source_set("unit_tests") {
   testonly = true
   sources = [
     "audio_block_fifo_unittest.cc",
     "audio_buffer_converter_unittest.cc",
     "audio_buffer_queue_unittest.cc",
     "audio_buffer_unittest.cc",
     "audio_bus_unittest.cc",
     "audio_converter_unittest.cc",
     "audio_discard_helper_unittest.cc",
     "audio_fifo_unittest.cc",
@@ skipping 24 matching lines @@
     "feedback_signal_accumulator_unittest.cc",
     "gmock_callback_support_unittest.cc",
     "key_systems_unittest.cc",
     "media_url_demuxer_unittest.cc",
     "mime_util_unittest.cc",
     "moving_average_unittest.cc",
     "multi_channel_resampler_unittest.cc",
     "null_video_sink_unittest.cc",
     "pipeline_impl_unittest.cc",
     "ranges_unittest.cc",
-    "run_all_unittests.cc",
     "seekable_buffer_unittest.cc",
     "serial_runner_unittest.cc",
     "silent_sink_suspender_unittest.cc",
     "sinc_resampler_unittest.cc",
     "stream_parser_unittest.cc",
     "text_ranges_unittest.cc",
     "text_renderer_unittest.cc",
     "time_delta_interpolator_unittest.cc",
     "user_input_monitor_unittest.cc",
     "vector_math_unittest.cc",
     "video_codecs_unittest.cc",
     "video_decoder_config_unittest.cc",
     "video_frame_pool_unittest.cc",
     "video_frame_unittest.cc",
     "video_util_unittest.cc",
     "wall_clock_time_source_unittest.cc",
     "yuv_convert_unittest.cc",
   ]
   configs += [
     "//build/config/compiler:no_size_t_to_int_warning",
     "//media:media_config",
   ]
   deps = [
     ":test_support",
     "//base/test:test_support",
     "//gpu/command_buffer/common",
     "//media",
-    "//media/base/android:anywhere_unittests",
+    "//media/base/android:anywhere_unit_tests",
     "//ppapi/features",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   # 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) {
-    deps += [ "//ui/gl" ]
+    deps += [
+      "//media/base/android:unit_tests",
+      "//ui/gl",
+    ]
   }
 
   if (current_cpu == "x86" || current_cpu == "x64") {
     sources += [ "simd/convert_rgb_to_yuv_unittest.cc" ]
   }
 }
 
+test("media_base_unittests") {
+  deps = [
+    ":unit_tests",
+    "//media/test:run_all_unittests",
+  ]
+
+  if (is_android) {
+    deps += [
+      # The test needs the java dependencies to add the java classes for their
+      # native counterparts to the test apk.
+      "//media/base/android:media_java",
+      "//ui/android:ui_java",
+    ]
+  }
+}
+
 source_set("perftests") {
   testonly = true
   sources = [
     "audio_bus_perftest.cc",
     "audio_converter_perftest.cc",
     "run_all_perftests.cc",
     "sinc_resampler_perftest.cc",
     "vector_math_perftest.cc",
     "yuv_convert_perftest.cc",
   ]
@@ skipping 91 matching lines @@
 
 fuzzer_test("media_container_names_fuzzer") {
   sources = [
     "container_names_fuzzertest.cc",
   ]
   deps = [
     "//base",
     "//media",
   ]
 }