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

services/service_manager/tests/lifecycle/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("lifecycle") {
   testonly = true
   sources = [
     "lifecycle_unittest.cc",
   ]
@@ skipping 64 matching lines @@
     "//services/service_manager/public/interfaces",
   ]
   data_deps = [
     ":lifecycle_unittest_package_manifest",
   ]
 }
 
 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",
+  ]
 }
 
 service("lifecycle_unittest_app") {
   testonly = true
   sources = [
     "app.cc",
   ]
   deps = [
     ":app_client",
     ":interfaces",
@@ skipping 47 matching lines @@
 
   data_deps = [
     ":lifecycle_unittest_exe_manifest",
   ]
 }
 
 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",
-  ]
-}