media: Reorganize media unittests

media/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/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
@@ skipping 500 matching lines @@
 static_library("cdm_paths") {
   sources = [
     "cdm/cdm_paths.cc",
     "cdm/cdm_paths.h",
   ]
   deps = [
     "//base",
   ]
 }
 
-test("media_unittests") {
+# TODO(xhwang): Move these into source_sets in respective subfolders.
+source_set("unit_tests") {
+  testonly = true
   sources = [
     "cdm/aes_decryptor_unittest.cc",
     "cdm/external_clear_key_test_helper.cc",
     "cdm/external_clear_key_test_helper.h",
     "cdm/json_web_key_unittest.cc",
     "cdm/simple_cdm_allocator.cc",
     "cdm/simple_cdm_allocator.h",
     "cdm/simple_cdm_allocator_unittest.cc",
     "cdm/simple_cdm_buffer.cc",
     "cdm/simple_cdm_buffer.h",
@@ skipping 60 matching lines @@
 
   deps = [
     ":cdm_api",
     ":cdm_paths",
     ":media",
     ":test_support",
     "//base/test:test_support",
     "//gpu:test_support",
     "//gpu/command_buffer/common",
     "//media/audio:test_support",
-    "//media/audio:unittests",
+    "//media/audio:unit_tests",
     "//media/base:test_support",
-    "//media/base:unittests",
+    "//media/base:unit_tests",
     "//media/test:pipeline_integration_tests",
     "//ppapi/features",
     "//skia",  # Direct dependency required to inherit config.
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/libwebm",
     "//third_party/libyuv",
     "//third_party/widevine/cdm:headers",
     "//ui/gfx:test_support",
     "//url",
   ]
 
   data_deps = []
 
   if (is_android) {
     sources -= [
       "filters/decrypting_audio_decoder_unittest.cc",
       "filters/decrypting_video_decoder_unittest.cc",
     ]
     deps += [
       "//media/base/android:media_java",
-      "//media/base/android:unittests",
+      "//media/base/android:unit_tests",
       "//ui/android:ui_java",
     ]
   }
   if (is_mac || is_ios) {
-    deps += [ "//media/base/mac:unittests" ]
+    deps += [ "//media/base/mac:unit_tests" ]
   }
 
   # If ExternalClearKey is built, we can test CdmAdapter.
   if (enable_pepper_cdms) {
     sources += [ "cdm/cdm_adapter_unittest.cc" ]
     data_deps += [ "//media/cdm/ppapi:clearkeycdm" ]
   }
 
   if (media_use_ffmpeg) {
     deps += [ "//media/ffmpeg:ffmpeg_unittests" ]
@@ skipping 57 matching lines @@
     }
   }
 
   if (is_mac || is_ios) {
     libs = [
       "AppKit.framework",
       "Foundation.framework",
     ]
   }
 
-  #      include_dirs += [
-  #        # Needed by media_drm_bridge.cc.
-  #        target_gen_dir,
-  #      ],
-
   configs += [ ":media_config" ]
 
   if (media_use_ffmpeg) {
-    deps += [ "//third_party/ffmpeg" ]  # Direct dependency required to inherit config.
+    # Direct dependency required to inherit config.
+    deps += [ "//third_party/ffmpeg" ]
   }
 }
 
+# Contains tests for the "media" target, including subfolders "base", "cdm",
+# "filters", "format", "renderer", etc.
+test("media_base_unittests") {

[watk, 2016/10/18 23:42:22]

I only have nits/discussion points:

* I don't love the name because it's surprising that this isn't only  for
targets in //media/base. Is media_core_unittests less ambiguous?

* minor, but might be worth leaving out this new target until your next CL that
makes it different. Weird to have identical targets for the interim.

[xhwang, 2016/10/20 16:33:09]

Agreed. But I don't like media_core_unittests since it's hard to figure out what
is "core".

Updated so that media_base_unittests only covers media/base:unit_tests.
Now this isn't a problem anymore.

[watk, 2016/10/20 21:24:20]

Sounds good. I prefer not having a target for an unclear subset of tests as
well.

+  deps = [
+    ":unit_tests",
+    "//media/test:run_all_unittests",
+  ]
+}
+
+# Contains tests for all targets in "media" folder.

[watk, 2016/10/18 23:42:22]

s/in "media"/in the "media"/

[xhwang, 2016/10/20 16:33:09]

Done.

+# TODO(xhwang): Move mojo/capture/remoting tests here where applicable.
+test("media_unittests") {
+  deps = [
+    ":unit_tests",
+    "//media/test:run_all_unittests",
+  ]
+}
+
 test("media_perftests") {
   configs += [ ":media_config" ]
   deps = [
     ":media",
     ":shared_memory_support",
     ":test_support",
     "//base/test:test_support",
     "//media/audio:test_support",
     "//media/base:perftests",
     "//media/base:test_support",
     "//media/test:pipeline_integration_perftests",
     "//testing/gmock",
     "//testing/gtest",
     "//testing/perf",
     "//third_party/widevine/cdm:headers",
     "//ui/gfx:test_support",
   ]
   if (media_use_ffmpeg) {
-    deps += [ "//third_party/ffmpeg" ]  # Direct dependency required to inherit config.
+    # Direct dependency required to inherit config.
+    deps += [ "//third_party/ffmpeg" ]
   }
 
   # This target should not require the Chrome executable to run.
   assert_no_deps = [ "//chrome" ]
 
   data = [
     "test/data/",
   ]
 }
 
 # For running the subset of media_unittests that might require audio hardware
 # separately on GPU bots. media_unittests includes these too.
 test("audio_unittests") {
-  sources = [
-    "base/run_all_unittests.cc",
-  ]
   deps = [
     ":test_support",
     "//base/test:test_support",
-    "//media/audio:unittests",
+    "//media/audio:unit_tests",
     "//media/base:test_support",
+    "//media/test:run_all_unittests",
     "//ui/gfx:test_support",
   ]
 }
 
 static_library("test_support") {
   testonly = true
   sources = [
     "renderers/mock_gpu_memory_buffer_video_frame_pool.cc",
     "renderers/mock_gpu_memory_buffer_video_frame_pool.h",
     "renderers/mock_gpu_video_accelerator_factories.cc",
@@ skipping 133 matching lines @@
 fuzzer_test("media_webm_muxer_fuzzer") {
   sources = [
     "muxers/webm_muxer_fuzzertest.cc",
   ]
   deps = [
     ":media",
     "//base",
     "//third_party/libwebm",
   ]
 }