Revert of [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 2e70540f0b0a15c031f07261c71799cf39dd1b61..eb3bd4619a2e565c573637ab2c3573d9414b26ee 100644
--- a/services/service_manager/tests/lifecycle/BUILD.gn
+++ b/services/service_manager/tests/lifecycle/BUILD.gn
@@ -2,7 +2,6 @@
 # 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")
@@ -87,9 +86,13 @@
 service_manifest("lifecycle_unittest_package_manifest") {
   name = "lifecycle_unittest_package"
   source = "package_manifest.json"
-  packaged_services = [
+  deps = [
     ":lifecycle_unittest_package_app_a_manifest",
     ":lifecycle_unittest_package_app_b_manifest",
+  ]
+  packaged_services = [
+    "lifecycle_unittest_package_app_a",
+    "lifecycle_unittest_package_app_b",
   ]
 }
 
@@ -158,14 +161,3 @@
   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",
-  ]
-}