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

services/service_manager/background/tests/BUILD.gn

Index: services/service_manager/background/tests/BUILD.gn
diff --git a/services/service_manager/background/tests/BUILD.gn b/services/service_manager/background/tests/BUILD.gn
index 4ca19a00689a56020ae2b7cbf1d1b9a7eb3a9698..968d9efc725025b1bc390724dd9bf8f496b31339 100644
--- a/services/service_manager/background/tests/BUILD.gn
+++ b/services/service_manager/background/tests/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//mojo/public/tools/bindings/mojom.gni")
-import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
@@ -18,6 +17,7 @@
     ":test_service_interfaces",
     "//base",
     "//services/service_manager/background:lib",
+    "//services/service_manager/background:main",
     "//services/service_manager/public/cpp:sources",
     "//testing/gtest",
     "//url",
@@ -61,9 +61,3 @@
   name = "background_service_manager_test_service"
   source = "test_service_manifest.json"
 }
-
-catalog("catalog") {
-  embedded_services = [ ":test_manifest" ]
-
-  standalone_services = [ ":test_service_manifest" ]
-}