Misc service_manager and service test cleanup

services/service_manager/tests/shutdown/BUILD.gn

Index: services/service_manager/tests/shutdown/BUILD.gn
diff --git a/services/service_manager/tests/shutdown/BUILD.gn b/services/service_manager/tests/shutdown/BUILD.gn
index c07d1ff926359d4fba036943cf1f22eb925c2eef..e5decbda087a7992cc27988339571920a9848a41 100644
--- a/services/service_manager/tests/shutdown/BUILD.gn
+++ b/services/service_manager/tests/shutdown/BUILD.gn
@@ -28,7 +28,6 @@ source_set("shutdown") {
   data_deps = [
     ":shutdown_client",
     ":shutdown_service",
-    ":shutdown_unittest_manifest",
   ]
 }
 
@@ -59,9 +58,6 @@ service("shutdown_service") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":shutdown_service_manifest",
-  ]
 }
 
 service_manifest("shutdown_client_manifest") {
@@ -80,9 +76,6 @@ service("shutdown_client") {
     "//services/service_manager/public/cpp:sources",
     "//services/service_manager/public/interfaces",
   ]
-  data_deps = [
-    ":shutdown_client_manifest",
-  ]
 }
 
 catalog("catalog") {