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

chrome/test/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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//components/os_crypt/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")
 import("//ppapi/features/features.gni")
 import("//remoting/remoting_enable.gni")
 import("//rlz/features/features.gni")
 import("//services/service_manager/public/service_manifest.gni")
-import("//services/catalog/public/tools/catalog.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 # This target exists to reference other test executables to bring these files
 # into the build.
@@ skipping 1159 matching lines @@
       "base/mojo_test_connector.cc",
       "base/mojo_test_connector.h",
     ]
 
     deps += [
       "//mash/package",
       "//services/service_manager/background:lib",
     ]
 
     data_deps = [
-      ":mash_browser_tests_catalog_copy",
+      ":mash_browser_tests_manifest",
       "//chrome/app:service_manifests",
       "//mash/session",
     ]
   } else {
     sources += [ "base/browser_tests_main.cc" ]
   }
 }
 
 # Used only by chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
 chrome_repack_locales("repack_pseudo_locales") {
@@ skipping 3881 matching lines @@
       "//content/public/android:content_java",
     ]
   }
 }
 
 if (is_chromeos) {
   service_manifest("mash_browser_tests_manifest") {
     name = "mash_browser_tests"
 
     source = "base/mash_browser_tests_manifest.json"
-    packaged_services = [
+    deps = [
       "//ash/autoclick/mus:manifest",
       "//ash/mus:manifest",
       "//ash/touch_hud/mus:manifest",
       "//mash/catalog_viewer:manifest",
       "//mash/quick_launch:manifest",
       "//mash/session:manifest",
       "//mash/task_viewer:manifest",
       "//services/ui:manifest",
       "//services/ui/ime/test_ime_driver:manifest",
     ]
+    packaged_services = [
+      "accessibility_autoclick",
+      "ash",
+      "catalog_viewer",
+      "mash_session",
+      "quick_launch",
+      "task_viewer",
+      "test_ime_driver",
+      "touch_hud",
+      "ui",
+    ]
 
     if (is_linux && !is_android) {
-      packaged_services += [ "//components/font_service:manifest" ]
+      deps += [ "//components/font_service:manifest" ]
+      packaged_services += [ "font_service" ]
     }
   }
-
-  catalog("mash_browser_tests_catalog") {
-    testonly = true
-    embedded_services = [ ":mash_browser_tests_manifest" ]
-    standalone_services = [ "//services/tracing:manifest" ]
-    catalog_deps = [ "//chrome/app:catalog" ]
-  }
-
-  copy("mash_browser_tests_catalog_copy") {
-    testonly = true
-    sources = get_target_outputs(":mash_browser_tests_catalog")
-    outputs = [
-      "${root_out_dir}/mash_browser_tests_catalog.json",
-    ]
-    deps = [
-      ":mash_browser_tests_catalog",
-    ]
-  }
 }
 
 if (is_win) {
   loadable_module("conflicts_dll") {
     testonly = true
     sources = [
       "conflicts/conflicts_dll.cc",
     ]
   }
 }