Misc service_manager and service test cleanup

services/service_manager/tests/shutdown/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("//services/service_manager/public/service_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
@@ skipping 10 matching lines @@
     "//base",
     "//base/test:test_config",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
 
   data_deps = [
     ":shutdown_client",
     ":shutdown_service",
-    ":shutdown_unittest_manifest",
   ]
 }
 
 mojom("interfaces") {
   sources = [
     "shutdown_unittest.mojom",
   ]
 }
 
 service_manifest("shutdown_unittest_manifest") {
@@ skipping 10 matching lines @@
   testonly = true
   sources = [
     "shutdown_service_app.cc",
   ]
   deps = [
     ":interfaces",
     "//base",
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":shutdown_service_manifest",
-  ]
 }
 
 service_manifest("shutdown_client_manifest") {
   name = "shutdown_client"
   source = "shutdown_client_manifest.json"
 }
 
 service("shutdown_client") {
   testonly = true
   sources = [
     "shutdown_client_app.cc",
   ]
   deps = [
     ":interfaces",
     "//base",
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":shutdown_client_manifest",
-  ]
 }
 
 catalog("catalog") {
   embedded_services = [ ":shutdown_unittest_manifest" ]
 
   standalone_services = [
     ":shutdown_client_manifest",
     ":shutdown_service_manifest",
   ]
 }