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

services/service_manager/tests/connect/BUILD.gn

Index: services/service_manager/tests/connect/BUILD.gn
diff --git a/services/service_manager/tests/connect/BUILD.gn b/services/service_manager/tests/connect/BUILD.gn
index 579389c8ccdc5a754af32e79cc2d5227fa8232ee..10bc6232af81311bf88397c7ea7d559d7b0c096e 100644
--- a/services/service_manager/tests/connect/BUILD.gn
+++ b/services/service_manager/tests/connect/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")
@@ -77,9 +76,13 @@
 service_manifest("connect_test_package_manifest") {
   name = "connect_test_package"
   source = "connect_test_package_manifest.json"
-  packaged_services = [
+  deps = [
     ":connect_test_a_manifest",
     ":connect_test_b_manifest",
+  ]
+  packaged_services = [
+    "connect_test_a",
+    "connect_test_b",
   ]
 }
 
@@ -171,15 +174,3 @@
   name = "connect_test_exe"
   source = "connect_test_exe_manifest.json"
 }
-
-catalog("catalog") {
-  embedded_services = [ ":manifest" ]
-
-  standalone_services = [
-    ":connect_test_app_manifest",
-    ":connect_test_class_app_manifest",
-    ":connect_test_exe_manifest",
-    ":connect_test_package_manifest",
-    ":connect_test_singleton_app_manifest",
-  ]
-}