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

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 76e233f1d765dad95899be25e9605ccae6c51059..32b170e9dd73dfdb90eb359d350cd8b7c89c356b 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -18,7 +18,6 @@
 import("//remoting/remoting_enable.gni")
 import("//rlz/features/features.gni")
 import("//services/service_manager/public/service_manifest.gni")
-import("//services/catalog/public/tools/catalog.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
@@ -1198,7 +1197,7 @@
     ]
 
     data_deps = [
-      ":mash_browser_tests_catalog_copy",
+      ":mash_browser_tests_manifest",
       "//chrome/app:service_manifests",
       "//mash/session",
     ]
@@ -5100,7 +5099,7 @@
     name = "mash_browser_tests"
 
     source = "base/mash_browser_tests_manifest.json"
-    packaged_services = [
+    deps = [
       "//ash/autoclick/mus:manifest",
       "//ash/mus:manifest",
       "//ash/touch_hud/mus:manifest",
@@ -5111,28 +5110,22 @@
       "//services/ui:manifest",
       "//services/ui/ime/test_ime_driver:manifest",
     ]
+    packaged_services = [
+      "accessibility_autoclick",
+      "ash",
+      "catalog_viewer",
+      "mash_session",
+      "quick_launch",
+      "task_viewer",
+      "test_ime_driver",
+      "touch_hud",
+      "ui",
+    ]
 
     if (is_linux && !is_android) {
-      packaged_services += [ "//components/font_service:manifest" ]
-    }
-  }
-
-  catalog("mash_browser_tests_catalog") {
-    testonly = true
-    embedded_services = [ ":mash_browser_tests_manifest" ]
-    standalone_services = [ "//services/tracing:manifest" ]
-    catalog_deps = [ "//chrome/app:catalog" ]
-  }
-
-  copy("mash_browser_tests_catalog_copy") {
-    testonly = true
-    sources = get_target_outputs(":mash_browser_tests_catalog")
-    outputs = [
-      "${root_out_dir}/mash_browser_tests_catalog.json",
-    ]
-    deps = [
-      ":mash_browser_tests_catalog",
-    ]
+      deps += [ "//components/font_service:manifest" ]
+      packaged_services += [ "font_service" ]
+    }
   }
 }