Move display_service_unittests to services_unittests.

services/service_manager/public/tools/test/service_test.gni

Index: services/service_manager/public/tools/test/service_test.gni
diff --git a/services/service_manager/public/tools/test/service_test.gni b/services/service_manager/public/tools/test/service_test.gni
index 91369833df7fb44b2b25da2e553c79144ab81873..5b0bc354379a2fcb96d5dde447f2cd6d33d6a06b 100644
--- a/services/service_manager/public/tools/test/service_test.gni
+++ b/services/service_manager/public/tools/test/service_test.gni
@@ -19,15 +19,23 @@ template("service_test") {
   catalog_source_target = "${target_name}__catalog_source"
 
   test(target_name) {
-    forward_variables_from(invoker, "*", [ "catalog" ])
+    forward_variables_from(invoker,
+                           "*",
+                           [
+                             "catalog",
+                             "test_runner",
+                           ])
 
     if (!defined(deps)) {
       deps = []
     }
-    deps += [
-      ":$catalog_source_target",
-      "//services/service_manager/public/cpp/test:run_all_service_tests",
-    ]
+    deps += [ ":$catalog_source_target" ]
+    if (defined(invoker.test_runner)) {

[Elliot Glaysher, 2017/05/24 22:02:28]

This it the thing that I'm not sure about. This lets a service_test() declare
what target it wants to use as a test runner. If not specified, it'll use the
default service_manager test runner.

+      deps += [ invoker.test_runner ]
+    } else {
+      deps +=
+          [ "//services/service_manager/public/cpp/test:run_all_service_tests" ]
+    }
   }
 
   catalog_cpp_source(catalog_source_target) {