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

ui/views/mus/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/features.gni")
 import("//build/config/ui.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")
 import("//tools/grit/repack.gni")
 
 component("mus") {
   output_name = "ui_views_mus_lib"
 
   sources = [
     "aura_init.cc",
@@ skipping 97 matching lines @@
     "../test/native_widget_factory_aura_mus.cc",
     "test_utils.h",
     "views_mus_test_suite.cc",
     "views_mus_test_suite.h",
   ]
 
   deps = [
     ":mus",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
-    "//services/catalog:lib",
     "//services/service_manager/background:lib",
     "//services/service_manager/public/cpp:sources",
     "//services/ui/common:mus_common",
     "//testing/gtest",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/gl:test_support",
     "//ui/resources",
     "//ui/resources:ui_test_pak",
     "//ui/views",
     "//ui/views:test_support_internal",
   ]
 
   data_deps = [
-    ":views_mus_tests_catalog",
     "//ui/resources:ui_test_pak_data",
   ]
 }
 
 test("views_mus_unittests") {
   testonly = true
 
   sources = [
     "desktop_window_tree_host_mus_unittest.cc",
     "pointer_watcher_event_router_unittest.cc",
     "run_all_unittests_mus.cc",
     "screen_mus_unittest.cc",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
 
   deps = [
     ":mus",
     ":test_support",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//cc",
     "//net",
+    "//services/service_manager/background:main",  # Provides main().
     "//services/ui/public/interfaces",
     "//skia",
     "//testing/gtest",
     "//third_party/icu",
     "//ui/accessibility",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base",
     "//ui/base:test_support",
     "//ui/base/ime",
     "//ui/compositor:test_support",
     "//ui/events:dom_keycode_converter",
     "//ui/events:events_base",
     "//ui/events:test_support",
     "//ui/events/platform",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/native_theme",
     "//ui/strings",
     "//ui/touch_selection",
     "//ui/views",
     "//ui/views:test_support_internal",
     "//ui/views:views_unittests_sources",
     "//ui/wm",
     "//url",
   ]
 
   data_deps = [
-    ":views_mus_tests_catalog_copy",
+    ":unittests_manifest",
     "//services/ui/ime/test_ime_driver",
     "//services/ui/test_wm",
   ]
 
   if (is_win) {
     deps += [
       "//build/win:default_exe_manifest",
       "//third_party/iaccessible2",
       "//third_party/wtl",
     ]
@@ skipping 25 matching lines @@
   sources = [
     "../widget/widget_interactive_uitest.cc",
     "clipboard_unittest.cc",
     "interactive_ui_tests_mus.cc",
   ]
 
   deps = [
     ":mus",
     ":test_support",
     "//base",
+    "//services/service_manager/background:main",  # Provides main().
     "//testing/gmock",
     "//testing/gtest",
     "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
     "//ui/events:events_base",
     "//ui/events:test_support",
     "//ui/gl:test_support",
     "//ui/touch_selection",
     "//ui/views",
     "//ui/views:test_support_internal",
     "//ui/wm",
   ]
 
   data_deps = [
-    ":views_mus_tests_catalog_copy",
+    ":interactive_ui_tests_manifest",
     "//services/ui/test_wm",
   ]
 
   if (is_win) {
     deps += [
       "//build/win:default_exe_manifest",
       "//third_party/iaccessible2",
       "//third_party/wtl",
     ]
     libs = [
       "imm32.lib",
       "oleacc.lib",
       "comctl32.lib",
     ]
   }
 }
 
 service_manifest("unittests_manifest") {
   name = "views_mus_unittests"
   source = "unittests_manifest.json"
 }
 
 service_manifest("interactive_ui_tests_manifest") {
   name = "views_mus_interactive_ui_tests"
   source = "interactive_ui_tests_manifest.json"
 }
-
-catalog("views_mus_tests_catalog") {
-  testonly = true
-
-  embedded_services = [
-    ":unittests_manifest",
-    ":interactive_ui_tests_manifest",
-  ]
-
-  standalone_services = [ "//services/ui/test_wm:manifest" ]
-
-  catalog_deps = [ "//mash:catalog" ]
-}
-
-copy("views_mus_tests_catalog_copy") {
-  testonly = true
-  sources = get_target_outputs(":views_mus_tests_catalog")
-  outputs = [
-    "${root_out_dir}/views_mus_tests_catalog.json",
-  ]
-  deps = [
-    ":views_mus_tests_catalog",
-  ]
-}