Misc service_manager and service test cleanup

services/service_manager/tests/BUILD.gn

Index: services/service_manager/tests/BUILD.gn
diff --git a/services/service_manager/tests/BUILD.gn b/services/service_manager/tests/BUILD.gn
index c5bbd22b22f029275ec47b690b4bb65f8c84144c..9c0a718bcb3decd698eadd05cb1655c46dd6ce76 100644
--- a/services/service_manager/tests/BUILD.gn
+++ b/services/service_manager/tests/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/tools/test/service_test.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
@@ -14,10 +15,8 @@ group("tests") {
   ]
 }
 
-test("service_manager_unittests") {
-  sources = [
-    "run_all_unittests.cc",
-  ]
+service_test("service_manager_unittests") {
+  catalog = ":service_manager_unittests_catalog"
 
   deps = [
     ":interfaces",
@@ -40,10 +39,6 @@ test("service_manager_unittests") {
     "//services/service_manager/tests/shutdown",
     "//testing/gtest",
   ]
-
-  data_deps = [
-    ":catalog",
-  ]
 }
 
 mojom("interfaces") {
@@ -76,13 +71,3 @@ catalog("service_manager_unittests_catalog") {
     "//services/service_manager/tests/shutdown:catalog",
   ]
 }
-
-copy("catalog") {
-  sources = get_target_outputs(":service_manager_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/service_manager_unittests_catalog.json",
-  ]
-  deps = [
-    ":service_manager_unittests_catalog",
-  ]
-}