Misc service_manager and service test cleanup

services/navigation/BUILD.gn

Index: services/navigation/BUILD.gn
diff --git a/services/navigation/BUILD.gn b/services/navigation/BUILD.gn
index 411829a41ca12cf546f59e10db376117e96a55b3..e30fe162baf91602c9a0378f7c278fb2bc24f67a 100644
--- a/services/navigation/BUILD.gn
+++ b/services/navigation/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")
 import("//tools/grit/repack.gni")
 
@@ -43,23 +44,24 @@ source_set("navigation") {
   ]
 }
 
-test("navigation_unittests") {
+service_test("navigation_unittests") {
   sources = [
     "navigation_unittest.cc",
   ]
 
+  catalog = ":navigation_unittests_catalog"
+
   deps = [
     "//base",
-    "//base/test:test_support",
+    "//mojo/public/cpp/bindings",
     "//services/navigation/public/interfaces",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
-    "//services/service_manager/public/cpp/test:run_all_service_tests",
+    "//services/service_manager/public/interfaces",
     "//testing/gtest",
   ]
 
   data_deps = [
-    ":unittest_manifest",
     "//content/shell:content_shell",
     "//services/ui/test_wm",
   ]
@@ -74,3 +76,12 @@ service_manifest("unittest_manifest") {
   name = "navigation_unittests"
   source = "unittest_manifest.json"
 }
+
+catalog("navigation_unittests_catalog") {
+  embedded_services = [ ":unittest_manifest" ]
+  standalone_services = [
+    ":manifest",
+    "//services/ui:manifest",
+    "//services/ui/test_wm:manifest",
+  ]
+}