[Service Manager] Get rid of dynamic service discovery

services/ui/ws/BUILD.gn

Index: services/ui/ws/BUILD.gn
diff --git a/services/ui/ws/BUILD.gn b/services/ui/ws/BUILD.gn
index 080e5e38555649f988f52a993ef362ce7f06e055..a8d8e199ac04047fdac9b75ea6d392e20ebb8841 100644
--- a/services/ui/ws/BUILD.gn
+++ b/services/ui/ws/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
+import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
@@ -209,6 +210,7 @@ test("mus_ws_unittests") {
     "event_matcher_unittest.cc",
     "focus_controller_unittest.cc",
     "frame_generator_unittest.cc",
+    "run_all_unittests.cc",
     "server_window_compositor_frame_sink_manager_test_api.cc",
     "server_window_compositor_frame_sink_manager_test_api.h",
     "server_window_drawn_tracker_unittest.cc",
@@ -235,10 +237,11 @@ test("mus_ws_unittests") {
     "//base/test:test_support",
     "//cc:cc",
     "//gpu/ipc/client",
+    "//mojo/edk/system",
     "//mojo/public/cpp/bindings:bindings",
+    "//services/catalog:lib",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp:sources",
-    "//services/service_manager/public/cpp/test:run_all_service_tests",
     "//services/service_manager/public/interfaces",
     "//services/ui/common:mus_common",
     "//services/ui/common:task_runner_test_base",
@@ -257,7 +260,7 @@ test("mus_ws_unittests") {
   ]
 
   data_deps = [
-    ":mus_ws_unittests_app_manifest",
+    ":mus_ws_unittests_catalog_copy",
   ]
 }
 
@@ -265,3 +268,19 @@ service_manifest("mus_ws_unittests_app_manifest") {
   name = "mus_ws_unittests_app"
   source = "mus_ws_unittests_app_manifest.json"
 }
+
+catalog("mus_ws_unittests_catalog") {
+  embedded_services = [ ":mus_ws_unittests_app_manifest" ]
+
+  standalone_services = [ "//services/ui:manifest" ]
+}
+
+copy("mus_ws_unittests_catalog_copy") {
+  sources = get_target_outputs(":mus_ws_unittests_catalog")
+  outputs = [
+    "${root_out_dir}/mus_ws_unittests_catalog.json",
+  ]
+  deps = [
+    ":mus_ws_unittests_catalog",
+  ]
+}