Misc service_manager and service test cleanup

services/video_capture/BUILD.gn

Index: services/video_capture/BUILD.gn
diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn
index eeb080e74e82b4e07c256b5a8a6f2fa815f6ad43..c6a60f8a8756e56c291525eb762afd8b0fda8a96 100644
--- a/services/video_capture/BUILD.gn
+++ b/services/video_capture/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
+import("//services/service_manager/public/tools/test/service_test.gni")
 import("//testing/test.gni")
 
 service("video_capture") {
@@ -46,7 +47,7 @@ source_set("lib") {
   ]
 }
 
-test("video_capture_unittests") {
+service_test("video_capture_unittests") {
   sources = [
     "test/fake_device_descriptor_test.cc",
     "test/fake_device_descriptor_test.h",
@@ -66,6 +67,8 @@ test("video_capture_unittests") {
     "test/service_unittest.cc",
   ]
 
+  catalog = ":video_capture_unittests_catalog"
+
   deps = [
     ":lib",
     ":video_capture",
@@ -73,7 +76,6 @@ test("video_capture_unittests") {
     "//media/capture/mojo:capture_types",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
-    "//services/service_manager/public/cpp/test:run_all_service_tests",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:test_support",
@@ -84,3 +86,8 @@ service_manifest("unittest_manifest") {
   name = "video_capture_unittests"
   source = "test/service_unittest_manifest.json"
 }
+
+catalog("video_capture_unittests_catalog") {
+  embedded_services = [ ":unittest_manifest" ]
+  standalone_services = [ ":manifest" ]
+}