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

services/service_manager/tests/BUILD.gn

 # Copyright 2016 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("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 group("tests") {
   testonly = true
   deps = [
     ":service_manager_unittests",
   ]
 }
 
 test("service_manager_unittests") {
-  sources = [
-    "run_all_unittests.cc",
-  ]
-
   deps = [
     ":interfaces",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//services/catalog:lib",
     "//services/catalog:unittests",
     "//services/service_manager",
     "//services/service_manager/background:lib",
+    "//services/service_manager/background:main",
     "//services/service_manager/background/tests:unittests",
     "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp/test:run_all_service_tests",
     "//services/service_manager/public/interfaces",
     "//services/service_manager/runner/host:unittests",
     "//services/service_manager/tests/connect",
     "//services/service_manager/tests/lifecycle",
     "//services/service_manager/tests/service_manager",
     "//services/service_manager/tests/shutdown",
     "//testing/gtest",
   ]
-
-  data_deps = [
-    ":catalog",
-  ]
 }
 
 mojom("interfaces") {
   sources = [
     "test.mojom",
   ]
 }
 
 source_set("util") {
   sources = [
     "util.cc",
     "util.h",
   ]
   deps = [
     "//base",
     "//base:base_static",
     "//mojo/edk/system",
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
     "//services/service_manager/runner/common",
   ]
 }
-
-catalog("service_manager_unittests_catalog") {
-  catalog_deps = [
-    "//services/service_manager/background/tests:catalog",
-    "//services/service_manager/tests/connect:catalog",
-    "//services/service_manager/tests/lifecycle:catalog",
-    "//services/service_manager/tests/service_manager:catalog",
-    "//services/service_manager/tests/shutdown:catalog",
-  ]
-}
-
-copy("catalog") {
-  sources = get_target_outputs(":service_manager_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/service_manager_unittests_catalog.json",
-  ]
-  deps = [
-    ":service_manager_unittests_catalog",
-  ]
-}