Misc service_manager and service test cleanup

media/mojo/services/BUILD.gn

Index: media/mojo/services/BUILD.gn
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 6450f6a9eb949424fd957652b81ba0c4104c1779..8b127613da9c1580556936f56638ec9282b6e73a 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -196,12 +196,13 @@ service_manifest("test_manifest") {
   source = "test_manifest.json"
 }
 
-test("media_pipeline_integration_unittests") {
+service_test("media_pipeline_integration_unittests") {
   testonly = true
 
+  catalog = ":media_pipeline_integration_unittests_catalog"
+
   deps = [
     "//media/test:mojo_pipeline_integration_tests",
-    "//services/service_manager/public/cpp/test:run_all_service_tests",
   ]
 
   data_deps = [
@@ -218,3 +219,8 @@ catalog("media_service_unittests_catalog") {
   embedded_services = [ ":test_manifest" ]
   standalone_services = [ ":media_manifest" ]
 }
+
+catalog("media_pipeline_integration_unittests_catalog") {
+  embedded_services = [ ":pipeline_test_manifest" ]
+  standalone_services = [ ":media_manifest" ]
+}