[Service Manager] Get rid of dynamic service discovery

services/service_manager/tests/lifecycle/BUILD.gn

Index: services/service_manager/tests/lifecycle/BUILD.gn
diff --git a/services/service_manager/tests/lifecycle/BUILD.gn b/services/service_manager/tests/lifecycle/BUILD.gn
index eb3bd4619a2e565c573637ab2c3573d9414b26ee..2e70540f0b0a15c031f07261c71799cf39dd1b61 100644
--- a/services/service_manager/tests/lifecycle/BUILD.gn
+++ b/services/service_manager/tests/lifecycle/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
@@ -86,14 +87,10 @@ service("lifecycle_unittest_package") {
 service_manifest("lifecycle_unittest_package_manifest") {
   name = "lifecycle_unittest_package"
   source = "package_manifest.json"
-  deps = [
+  packaged_services = [
     ":lifecycle_unittest_package_app_a_manifest",
     ":lifecycle_unittest_package_app_b_manifest",
   ]
-  packaged_services = [
-    "lifecycle_unittest_package_app_a",
-    "lifecycle_unittest_package_app_b",
-  ]
 }
 
 service("lifecycle_unittest_app") {
@@ -161,3 +158,14 @@ service_manifest("lifecycle_unittest_exe_manifest") {
   name = "lifecycle_unittest_exe"
   source = "exe_manifest.json"
 }
+
+catalog("catalog") {
+  embedded_services = [ ":manifest" ]
+
+  standalone_services = [
+    ":lifecycle_unittest_app_manifest",
+    ":lifecycle_unittest_exe_manifest",
+    ":lifecycle_unittest_package_manifest",
+    ":lifecycle_unittest_parent_manifest",
+  ]
+}