Misc service_manager and service test cleanup

services/video_capture/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/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")
 
 service("video_capture") {
   sources = [
     "service_impl.cc",
     "service_impl.h",
     "service_main.cc",
   ]
 
   deps = [
@@ skipping 22 matching lines @@
     "//media",
     "//media/capture:capture",
     "//media/capture/mojo:image_capture",
     "//media/mojo/common:common",
     "//mojo/common:common_base",
     "//services/service_manager/public/cpp",
     "//services/video_capture/public/interfaces",
   ]
 }
 
-test("video_capture_unittests") {
+service_test("video_capture_unittests") {
   sources = [
     "test/fake_device_descriptor_test.cc",
     "test/fake_device_descriptor_test.h",
     "test/fake_device_descriptor_unittest.cc",
     "test/fake_device_test.cc",
     "test/fake_device_test.h",
     "test/fake_device_unittest.cc",
     "test/mock_device_factory.cc",
     "test/mock_device_factory.h",
     "test/mock_device_test.cc",
     "test/mock_device_test.h",
     "test/mock_device_unittest.cc",
     "test/mock_receiver.cc",
     "test/mock_receiver.h",
     "test/service_test.cc",
     "test/service_test.h",
     "test/service_unittest.cc",
   ]
 
+  catalog = ":video_capture_unittests_catalog"
+
   deps = [
     ":lib",
     ":video_capture",
     "//base/test:test_support",
     "//media/capture/mojo:capture_types",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
-    "//services/service_manager/public/cpp/test:run_all_service_tests",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:test_support",
   ]
 }
 
 service_manifest("unittest_manifest") {
   name = "video_capture_unittests"
   source = "test/service_unittest_manifest.json"
 }
+
+catalog("video_capture_unittests_catalog") {
+  embedded_services = [ ":unittest_manifest" ]
+  standalone_services = [ ":manifest" ]
+}