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

media/mojo/services/BUILD.gn

Index: media/mojo/services/BUILD.gn
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index f9e46334d77a059d5b9a930c3e87c14522e290fd..3ee32122d8a77b323f362178a09b65a4ce6b0811 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//media/media_options.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")
@@ -167,27 +166,23 @@
 
     sources = [
       "media_service_unittest.cc",
-      "run_all_unittests.cc",
     ]
 
     deps = [
-      "//base",
-      "//base/test:test_support",
       "//media",
       "//media/base:test_support",
       "//media/mojo/clients",
       "//media/mojo/common",
       "//media/mojo/interfaces",
-      "//mojo/edk/system",
-      "//services/catalog:lib",
       "//services/service_manager/public/cpp:service_test_support",
+      "//services/service_manager/public/cpp/test:run_all_service_tests",
       "//testing/gmock",
       "//testing/gtest",
     ]
 
     data_deps = [
       ":media",
-      ":media_service_unittests_catalog_copy",
+      ":test_manifest",
     ]
   }
 }  # !(is_win && is_component_build)
@@ -220,18 +215,3 @@
   name = "media_pipeline_integration_unittests"
   source = "pipeline_test_manifest.json"
 }
-
-catalog("media_service_unittests_catalog") {
-  embedded_services = [ ":test_manifest" ]
-  standalone_services = [ ":media_manifest" ]
-}
-
-copy("media_service_unittests_catalog_copy") {
-  sources = get_target_outputs(":media_service_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/media_service_unittests_catalog.json",
-  ]
-  deps = [
-    ":media_service_unittests_catalog",
-  ]
-}