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

content/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/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/features/features.gni")
-import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 import("//third_party/WebKit/public/public_features.gni")
 import("//v8/gni/v8.gni")
 
 # Use a static library here because many test binaries depend on this but don't
 # require many files from it. This makes linking more efficient.
 static_library("test_support") {
   testonly = true
 
@@ skipping 692 matching lines @@
     "//ipc:test_support",
     "//media",
     "//media:test_support",
     "//media/audio:test_support",
     "//media/base:test_support",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/js",
     "//net:test_support",
     "//ppapi/features",
-    "//services/catalog:lib",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp/gpu",
     "//storage/browser",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/public:blink",
     "//third_party/leveldatabase",
     "//third_party/mesa:osmesa",
     "//third_party/zlib",
     "//ui/accessibility",
@@ skipping 717 matching lines @@
     "//media/capture/mojo:capture_types",
     "//media/midi:midi",
     "//media/midi:mojo",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//net:extras",
     "//net:test_support",
     "//ppapi/c",
     "//ppapi/features",
     "//printing",
-    "//services/catalog:lib",
     "//services/file:lib",
     "//services/file/public/interfaces",
     "//services/service_manager/public/cpp:service_test_support",
     "//skia",
     "//sql",
     "//sql:test_support",
     "//storage/browser",
     "//storage/common",
     "//testing/gmock",
     "//testing/gtest",
@@ skipping 13 matching lines @@
     "//ui/events/blink",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/ipc",
     "//ui/gfx/ipc/skia",
     "//ui/gl",
     "//ui/gl:test_support",
   ]
 
   data_deps = [
-    ":content_unittests_catalog_copy",
+    ":content_unittests_manifest",
     "//components/filesystem:filesystem",
     "//third_party/mesa:osmesa",
   ]
 
   if (!is_win) {
     sources += [ "../browser/file_descriptor_info_impl_unittest.cc" ]
   }
 
   if (enable_plugins) {
     # Put WebRTC-related plugins sources in the "enable_webrtc &&
@@ skipping 227 matching lines @@
   }
 
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
 }
 
 service_manifest("content_unittests_manifest") {
   name = "content_unittests"
   source = "unittests_manifest.json"
-  packaged_services = [ "//services/file:manifest" ]
-}
-
-catalog("content_unittests_catalog") {
-  embedded_services = [ ":content_unittests_manifest" ]
-}
-
-copy("content_unittests_catalog_copy") {
-  sources = get_target_outputs(":content_unittests_catalog")
-  outputs = [
-    "${root_out_dir}/content_unittests_catalog.json",
-  ]
+  packaged_services = [ "file" ]
   deps = [
-    ":content_unittests_catalog",
+    "//services/file:manifest",
   ]
 }
 
 test("content_perftests") {
   # See comment at the top of //content/BUILD.gn for why this is disabled in
   # component builds.
   if (is_component_build) {
     check_includes = false
   }
 
@@ skipping 20 matching lines @@
   if (is_android) {
     deps += [ "//testing/android/native_test:native_test_native_code" ]
   }
 }
 
 group("fuzzers") {
   deps = [
     "//content/test/fuzzer",
   ]
 }