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

components/filesystem/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("//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")
 
 static_library("lib") {
   sources = [
     "directory_impl.cc",
     "directory_impl.h",
     "file_impl.cc",
     "file_impl.h",
@@ skipping 46 matching lines @@
   name = "filesystem"
   source = "manifest.json"
 }
 
 test("filesystem_service_unittests") {
   sources = [
     "directory_impl_unittest.cc",
     "file_impl_unittest.cc",
     "files_test_base.cc",
     "files_test_base.h",
-    "run_all_unittests.cc",
   ]
 
   deps = [
     "//base",
-    "//base/test:test_support",
     "//components/filesystem/public/interfaces",
     "//mojo/common",
-    "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
-    "//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",
   ]
 
   data_deps = [
+    ":test_manifest",
     ":filesystem",
-    ":filesystem_service_unittests_catalog_copy",
   ]
 }
 
 service_manifest("test_manifest") {
   name = "filesystem_service_unittests"
   source = "test_manifest.json"
 }
-
-catalog("filesystem_service_unittests_catalog") {
-  embedded_services = [ ":test_manifest" ]
-  standalone_services = [ ":manifest" ]
-}
-
-copy("filesystem_service_unittests_catalog_copy") {
-  sources = get_target_outputs(":filesystem_service_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/filesystem_service_unittests_catalog.json",
-  ]
-  deps = [
-    ":filesystem_service_unittests_catalog",
-  ]
-}