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

services/service_manager/tests/BUILD.gn

Index: services/service_manager/tests/BUILD.gn
diff --git a/services/service_manager/tests/BUILD.gn b/services/service_manager/tests/BUILD.gn
index c5bbd22b22f029275ec47b690b4bb65f8c84144c..d3e5667751b376df48c069f2a7b4f169c4a11abf 100644
--- a/services/service_manager/tests/BUILD.gn
+++ b/services/service_manager/tests/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("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
@@ -15,23 +14,19 @@
 }
 
 test("service_manager_unittests") {
-  sources = [
-    "run_all_unittests.cc",
-  ]
-
   deps = [
     ":interfaces",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//services/catalog:lib",
     "//services/catalog:unittests",
     "//services/service_manager",
     "//services/service_manager/background:lib",
+    "//services/service_manager/background:main",
     "//services/service_manager/background/tests:unittests",
     "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp/test:run_all_service_tests",
     "//services/service_manager/public/interfaces",
     "//services/service_manager/runner/host:unittests",
     "//services/service_manager/tests/connect",
@@ -39,10 +34,6 @@
     "//services/service_manager/tests/service_manager",
     "//services/service_manager/tests/shutdown",
     "//testing/gtest",
-  ]
-
-  data_deps = [
-    ":catalog",
   ]
 }
 
@@ -66,23 +57,3 @@
     "//services/service_manager/runner/common",
   ]
 }
-
-catalog("service_manager_unittests_catalog") {
-  catalog_deps = [
-    "//services/service_manager/background/tests:catalog",
-    "//services/service_manager/tests/connect:catalog",
-    "//services/service_manager/tests/lifecycle:catalog",
-    "//services/service_manager/tests/service_manager:catalog",
-    "//services/service_manager/tests/shutdown:catalog",
-  ]
-}
-
-copy("catalog") {
-  sources = get_target_outputs(":service_manager_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/service_manager_unittests_catalog.json",
-  ]
-  deps = [
-    ":service_manager_unittests_catalog",
-  ]
-}