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

content/test/BUILD.gn

Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 612a1d5ecbc0d3e0d91ff211d2321e9727f1f660..08439095b03d482759caef99f38d6192c22025f8 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -11,7 +11,6 @@
 import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/features/features.gni")
-import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 import("//third_party/WebKit/public/public_features.gni")
@@ -724,7 +723,6 @@
     "//mojo/public/js",
     "//net:test_support",
     "//ppapi/features",
-    "//services/catalog:lib",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp/gpu",
     "//storage/browser",
@@ -1462,7 +1460,6 @@
     "//ppapi/c",
     "//ppapi/features",
     "//printing",
-    "//services/catalog:lib",
     "//services/file:lib",
     "//services/file/public/interfaces",
     "//services/service_manager/public/cpp:service_test_support",
@@ -1496,7 +1493,7 @@
   ]
 
   data_deps = [
-    ":content_unittests_catalog_copy",
+    ":content_unittests_manifest",
     "//components/filesystem:filesystem",
     "//third_party/mesa:osmesa",
   ]
@@ -1744,20 +1741,9 @@
 service_manifest("content_unittests_manifest") {
   name = "content_unittests"
   source = "unittests_manifest.json"
-  packaged_services = [ "//services/file:manifest" ]
-}
-
-catalog("content_unittests_catalog") {
-  embedded_services = [ ":content_unittests_manifest" ]
-}
-
-copy("content_unittests_catalog_copy") {
-  sources = get_target_outputs(":content_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/content_unittests_catalog.json",
-  ]
+  packaged_services = [ "file" ]
   deps = [
-    ":content_unittests_catalog",
+    "//services/file:manifest",
   ]
 }