Misc service_manager and service test cleanup

services/service_manager/public/cpp/test/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("//testing/test.gni")
 
-group("test") {
-  testonly = true
-  deps = [
-    ":run_all_service_tests",
-  ]
-}
-
+# NOTE: Don't depend on this target directly. Instead use the service_test
+# template from //services/service_manager/public/tools/test/service_test.gni.
 source_set("run_all_service_tests") {
   testonly = true
 
   sources = [
     "run_all_service_tests.cc",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//mojo/edk/system",
-    "//services/service_manager/background:lib",
-    "//services/service_manager/background:main",
-  ]
-}
-
-# TODO(rockot): Remove this when all consumers of :run_all_service_tests are
-# ported to service_test targets.
-source_set("run_all_service_tests_with_catalog") {
-  testonly = true
-
-  sources = [
-    "run_all_service_tests_with_catalog.cc",
     "service_test_catalog.h",
   ]
 
   deps = [
     "//base",
     "//base/test:test_support",
     "//mojo/edk/system",
     "//services/catalog:lib",
     "//services/service_manager/background:lib",
   ]
 }