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

services/service_manager/tests/service_manager/BUILD.gn

Index: services/service_manager/tests/service_manager/BUILD.gn
diff --git a/services/service_manager/tests/service_manager/BUILD.gn b/services/service_manager/tests/service_manager/BUILD.gn
index a59bba48fd958a80f577def5304fd324365c907b..d494b1b88ad9295151c91f6c7d6822f2d936cbbd 100644
--- a/services/service_manager/tests/service_manager/BUILD.gn
+++ b/services/service_manager/tests/service_manager/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")
@@ -76,7 +75,10 @@
 service_manifest("embedder_manifest") {
   name = "service_manager_unittest_embedder"
   source = "embedder_manifest.json"
-  packaged_services = [ ":singleton_manifest" ]
+  deps = [
+    ":singleton_manifest",
+  ]
+  packaged_services = [ "service_manager_unittest_singleton" ]
 }
 
 service_manifest("singleton_manifest") {
@@ -102,13 +104,9 @@
     "//services/service_manager/runner:init",
     "//services/service_manager/runner/common",
   ]
-}
 
-catalog("catalog") {
-  embedded_services = [ ":manifest" ]
-
-  standalone_services = [
+  data_deps = [
     ":embedder_manifest",
-    ":target_manifest",
+    ":singleton_manifest",
   ]
 }