Revert of [Service Manager] Get rid of dynamic service discovery

ui/views/mus/BUILD.gn

Index: ui/views/mus/BUILD.gn
diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn
index c568ec3320daed0c4169e3a0dcd7e7a22c02a11c..f891743b13854bd6fce37f54958d0760f8f01077 100644
--- a/ui/views/mus/BUILD.gn
+++ b/ui/views/mus/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
@@ -122,8 +121,6 @@
     ":mus",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
-    "//services/catalog:lib",
     "//services/service_manager/background:lib",
     "//services/service_manager/public/cpp:sources",
     "//services/ui/common:mus_common",
@@ -138,7 +135,6 @@
   ]
 
   data_deps = [
-    ":views_mus_tests_catalog",
     "//ui/resources:ui_test_pak_data",
   ]
 }
@@ -163,6 +159,7 @@
     "//base/test:test_support",
     "//cc",
     "//net",
+    "//services/service_manager/background:main",  # Provides main().
     "//services/ui/public/interfaces",
     "//skia",
     "//testing/gtest",
@@ -191,7 +188,7 @@
   ]
 
   data_deps = [
-    ":views_mus_tests_catalog_copy",
+    ":unittests_manifest",
     "//services/ui/ime/test_ime_driver",
     "//services/ui/test_wm",
   ]
@@ -237,6 +234,7 @@
     ":mus",
     ":test_support",
     "//base",
+    "//services/service_manager/background:main",  # Provides main().
     "//testing/gmock",
     "//testing/gtest",
     "//ui/aura",
@@ -252,7 +250,7 @@
   ]
 
   data_deps = [
-    ":views_mus_tests_catalog_copy",
+    ":interactive_ui_tests_manifest",
     "//services/ui/test_wm",
   ]
 
@@ -279,27 +277,3 @@
   name = "views_mus_interactive_ui_tests"
   source = "interactive_ui_tests_manifest.json"
 }
-
-catalog("views_mus_tests_catalog") {
-  testonly = true
-
-  embedded_services = [
-    ":unittests_manifest",
-    ":interactive_ui_tests_manifest",
-  ]
-
-  standalone_services = [ "//services/ui/test_wm:manifest" ]
-
-  catalog_deps = [ "//mash:catalog" ]
-}
-
-copy("views_mus_tests_catalog_copy") {
-  testonly = true
-  sources = get_target_outputs(":views_mus_tests_catalog")
-  outputs = [
-    "${root_out_dir}/views_mus_tests_catalog.json",
-  ]
-  deps = [
-    ":views_mus_tests_catalog",
-  ]
-}