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

services/ui/ws/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("//build/config/ui.gni")
 import("//testing/test.gni")
-import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 static_library("lib") {
   sources = [
     "accelerator.cc",
     "accelerator.h",
     "access_policy.h",
     "access_policy_delegate.h",
     "accessibility_manager.cc",
@@ skipping 185 matching lines @@
 
 test("mus_ws_unittests") {
   sources = [
     "cursor_unittest.cc",
     "display_unittest.cc",
     "drag_controller_unittest.cc",
     "event_dispatcher_unittest.cc",
     "event_matcher_unittest.cc",
     "focus_controller_unittest.cc",
     "frame_generator_unittest.cc",
-    "run_all_unittests.cc",
     "server_window_compositor_frame_sink_manager_test_api.cc",
     "server_window_compositor_frame_sink_manager_test_api.h",
     "server_window_drawn_tracker_unittest.cc",
     "test_server_window_delegate.cc",
     "test_server_window_delegate.h",
     "test_utils.cc",
     "test_utils.h",
     "transient_windows_unittest.cc",
     "user_activity_monitor_unittest.cc",
     "user_display_manager_unittest.cc",
     "window_coordinate_conversions_unittest.cc",
     "window_finder_unittest.cc",
     "window_manager_client_unittest.cc",
     "window_manager_state_unittest.cc",
     "window_tree_client_unittest.cc",
     "window_tree_unittest.cc",
   ]
 
   deps = [
     ":lib",
     ":test_support",
     "//base",
     "//base/test:test_config",
     "//base/test:test_support",
     "//cc:cc",
     "//gpu/ipc/client",
-    "//mojo/edk/system",
     "//mojo/public/cpp/bindings:bindings",
-    "//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/service_manager/public/interfaces",
     "//services/ui/common:mus_common",
     "//services/ui/common:task_runner_test_base",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
     "//testing/gtest",
     "//third_party/mesa:osmesa",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
     "//ui/gl",
   ]
 
   data_deps = [
-    ":mus_ws_unittests_catalog_copy",
+    ":mus_ws_unittests_app_manifest",
   ]
 }
 
 service_manifest("mus_ws_unittests_app_manifest") {
   name = "mus_ws_unittests_app"
   source = "mus_ws_unittests_app_manifest.json"
 }
-
-catalog("mus_ws_unittests_catalog") {
-  embedded_services = [ ":mus_ws_unittests_app_manifest" ]
-
-  standalone_services = [ "//services/ui:manifest" ]
-}
-
-copy("mus_ws_unittests_catalog_copy") {
-  sources = get_target_outputs(":mus_ws_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/mus_ws_unittests_catalog.json",
-  ]
-  deps = [
-    ":mus_ws_unittests_catalog",
-  ]
-}