media: Reorganize media unittests

media/base/BUILD.gn

Index: media/base/BUILD.gn
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index e988f39544930956b5a2a350557c27345935645b..845302a4a29b8024928ac5af9074b1bb096414f4 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -388,7 +388,7 @@ static_library("test_support") {
   ]
 }
 
-source_set("unittests") {
+source_set("unit_tests") {
   testonly = true
   sources = [
     "audio_block_fifo_unittest.cc",
@@ -433,7 +433,6 @@ source_set("unittests") {
     "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",
@@ -461,7 +460,7 @@ source_set("unittests") {
     "//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",
@@ -478,7 +477,10 @@ source_set("unittests") {
   }
 
   if (is_android) {
-    deps += [ "//ui/gl" ]
+    deps += [
+      "//media/base/android:unit_tests",
+      "//ui/gl",
+    ]
   }
 
   if (current_cpu == "x86" || current_cpu == "x64") {
@@ -486,6 +488,22 @@ source_set("unittests") {
   }
 }
 
+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 = [