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

services/service_manager/tests/connect/BUILD.gn

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # 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")
 import("//testing/test.gni")
 
 source_set("connect") {
   testonly = true
   sources = [
     "connect_unittest.cc",
   ]
@@ skipping 54 matching lines @@
     "//services/service_manager/public/interfaces",
   ]
   data_deps = [
     ":connect_test_package_manifest",
   ]
 }
 
 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",
+  ]
 }
 
 service("connect_test_app") {
   testonly = true
   sources = [
     "connect_test_app.cc",
   ]
   deps = [
     ":interfaces",
     "//base",
@@ skipping 70 matching lines @@
 
   data_deps = [
     ":connect_test_exe_manifest",
   ]
 }
 
 service_manifest("connect_test_exe_manifest") {
   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",
-  ]
-}