Misc service_manager and service test cleanup

services/service_manager/public/cpp/test/BUILD.gn

Index: services/service_manager/public/cpp/test/BUILD.gn
diff --git a/services/service_manager/public/cpp/test/BUILD.gn b/services/service_manager/public/cpp/test/BUILD.gn
index 569aac006bac2acd750e499a20a4b4a3a55e52e6..c1adadf217f6815bc1f80717a01d0e743469a960 100644
--- a/services/service_manager/public/cpp/test/BUILD.gn
+++ b/services/service_manager/public/cpp/test/BUILD.gn
@@ -4,36 +4,13 @@
 
 import("//testing/test.gni")
 
-group("test") {
-  testonly = true
-  deps = [
-    ":run_all_service_tests",
-  ]
-}
-
+# NOTE: Don't depend on this target directly. Instead use the service_test
+# template from //services/service_manager/public/tools/test/service_test.gni.
 source_set("run_all_service_tests") {
   testonly = true
 
   sources = [
     "run_all_service_tests.cc",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//mojo/edk/system",
-    "//services/service_manager/background:lib",
-    "//services/service_manager/background:main",
-  ]
-}
-
-# TODO(rockot): Remove this when all consumers of :run_all_service_tests are
-# ported to service_test targets.
-source_set("run_all_service_tests_with_catalog") {
-  testonly = true
-
-  sources = [
-    "run_all_service_tests_with_catalog.cc",
     "service_test_catalog.h",
   ]