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

services/ui/clipboard/BUILD.gn

Index: services/ui/clipboard/BUILD.gn
diff --git a/services/ui/clipboard/BUILD.gn b/services/ui/clipboard/BUILD.gn
index 7df28dc7f38f477b4226244fef74938fb730ee71..801bb447019a466f75fb0062eb8427a0a56dfe6f 100644
--- a/services/ui/clipboard/BUILD.gn
+++ b/services/ui/clipboard/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("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
@@ -33,23 +32,20 @@
 test("mus_clipboard_unittests") {
   sources = [
     "clipboard_unittest.cc",
-    "run_all_unittests.cc",
   ]
 
   deps = [
     "//base",
-    "//base/test:test_support",
     "//mojo/common",
-    "//mojo/edk/system",
-    "//services/catalog:lib",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp:sources",
+    "//services/service_manager/public/cpp/test:run_all_service_tests",
     "//services/ui/public/interfaces",
   ]
 
   data_deps = [
+    ":test_manifest",
     ":lib",
-    ":mus_clipboard_unittests_catalog_copy",
     "//services/ui",
   ]
 }
@@ -58,18 +54,3 @@
   name = "mus_clipboard_unittests"
   source = "test_manifest.json"
 }
-
-catalog("mus_clipboard_unittests_catalog") {
-  embedded_services = [ ":test_manifest" ]
-  standalone_services = [ "//services/ui:manifest" ]
-}
-
-copy("mus_clipboard_unittests_catalog_copy") {
-  sources = get_target_outputs(":mus_clipboard_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/mus_clipboard_unittests_catalog.json",
-  ]
-  deps = [
-    ":mus_clipboard_unittests_catalog",
-  ]
-}