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

media/mojo/services/BUILD.gn

 # Copyright 2014 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("//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")
 
 config("mojo_media_config") {
   if (!enable_mojo_media) {
     assert(mojo_media_services == [], "Mojo media is not enabled")
     assert(mojo_media_host == "none", "Mojo media is not enabled")
     assert(!enable_test_mojo_media_client, "Mojo media is not enabled")
   } else {
@@ skipping 143 matching lines @@
 
 # crbug.com/676055: media_service_unittests currently fails to link in Windows
 # component builds, so don't declare it, otherwise the "all" target will still
 # try to build it.
 if (!(is_win && is_component_build)) {
   test("media_service_unittests") {
     testonly = true
 
     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)
 
 service_manifest("media_manifest") {
   name = "media"
   source = "media_manifest.json"
 }
 
 service_manifest("test_manifest") {
@@ skipping 12 matching lines @@
   data_deps = [
     ":media",
     ":pipeline_test_manifest",
   ]
 }
 
 service_manifest("pipeline_test_manifest") {
   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",
-  ]
-}