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

services/ui/demo/BUILD.gn

Index: services/ui/demo/BUILD.gn
diff --git a/services/ui/demo/BUILD.gn b/services/ui/demo/BUILD.gn
index 88278a3301c32080c97127a7cfb521480ddb5e0b..85f03dba4506d8cff53cb424a502bb39260fe1cd 100644
--- a/services/ui/demo/BUILD.gn
+++ b/services/ui/demo/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")
@@ -62,24 +61,21 @@
 
   sources = [
     "mus_demo_unittests.cc",
-    "run_all_unittests.cc",
   ]
 
   deps = [
     ":demo",
     "//base",
-    "//base/test:test_support",
-    "//mojo/edk/system",
-    "//services/catalog:lib",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
+    "//services/ui/common:run_all_service_tests",
     "//services/ui/public/interfaces",
     "//testing/gtest",
   ]
 
   data_deps = [
     ":mus_demo",
-    ":mus_demo_unittests_catalog_copy",
+    ":test_manifest",
   ]
 }
 
@@ -88,22 +84,3 @@
     ":mus_demo",
   ]
 }
-
-catalog("mus_demo_unittests_catalog") {
-  embedded_services = [ ":test_manifest" ]
-
-  standalone_services = [
-    ":manifest",
-    "//services/ui:manifest",
-  ]
-}
-
-copy("mus_demo_unittests_catalog_copy") {
-  sources = get_target_outputs(":mus_demo_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/mus_demo_unittests_catalog.json",
-  ]
-  deps = [
-    ":mus_demo_unittests_catalog",
-  ]
-}