[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 897e3c3892c10f5db78f041645e381e884bbaa0c..1546079787d1aa93b9acc2a4f04ab1d554bd2930 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -18,6 +18,7 @@ import("//ppapi/features/features.gni")
 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")
@@ -1197,7 +1198,7 @@ static_library("browser_tests_runner") {
     ]
 
     data_deps = [
-      ":mash_browser_tests_manifest",
+      ":mash_browser_tests_catalog_copy",
       "//chrome/app:service_manifests",
       "//mash/session",
     ]
@@ -5094,7 +5095,7 @@ if (is_chromeos) {
     name = "mash_browser_tests"
 
     source = "base/mash_browser_tests_manifest.json"
-    deps = [
+    packaged_services = [
       "//ash/autoclick/mus:manifest",
       "//ash/mus:manifest",
       "//ash/touch_hud/mus:manifest",
@@ -5105,23 +5106,29 @@ if (is_chromeos) {
       "//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) {
-      deps += [ "//components/font_service:manifest" ]
-      packaged_services += [ "font_service" ]
+      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",
+    ]
+  }
 }
 
 if (is_win) {