Misc service_manager and service test cleanup

media/mojo/services/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("//media/media_options.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//services/service_manager/public/tools/test/service_test.gni")
 import("//testing/test.gni")
@@ skipping 178 matching lines @@
 service_manifest("media_manifest") {
   name = "media"
   source = "media_manifest.json"
 }
 
 service_manifest("test_manifest") {
   name = "media_service_unittests"
   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 = [
     ":media",
   ]
 }
 
 service_manifest("pipeline_test_manifest") {
   name = "media_pipeline_integration_unittests"
   source = "pipeline_test_manifest.json"
 }
 
 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" ]
+}