Merge video_capture tests into service_unittests

services/video_capture/BUILD.gn

Index: services/video_capture/BUILD.gn
diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn
index c6a60f8a8756e56c291525eb762afd8b0fda8a96..1fc606e8e7933f89fec0e25e96c8f7398a5a7f0d 100644
--- a/services/video_capture/BUILD.gn
+++ b/services/video_capture/BUILD.gn
@@ -47,7 +47,9 @@ source_set("lib") {
   ]
 }
 
-service_test("video_capture_unittests") {
+source_set("tests") {
+  testonly = true
+
   sources = [
     "test/fake_device_descriptor_test.cc",
     "test/fake_device_descriptor_test.h",
@@ -67,8 +69,6 @@ service_test("video_capture_unittests") {
     "test/service_unittest.cc",
   ]
 
-  catalog = ":video_capture_unittests_catalog"
-
   deps = [
     ":lib",
     ":video_capture",
@@ -80,6 +80,10 @@ service_test("video_capture_unittests") {
     "//testing/gtest",
     "//ui/gfx:test_support",
   ]
+
+  data_deps = [
+    ":video_capture",
+  ]
 }
 
 service_manifest("unittest_manifest") {
@@ -87,7 +91,7 @@ service_manifest("unittest_manifest") {
   source = "test/service_unittest_manifest.json"
 }
 
-catalog("video_capture_unittests_catalog") {
+catalog("tests_catalog") {
   embedded_services = [ ":unittest_manifest" ]
   standalone_services = [ ":manifest" ]
 }