Move ui_services_unittests into service_unittest.

services/ui/ws/BUILD.gn

Index: services/ui/ws/BUILD.gn
diff --git a/services/ui/ws/BUILD.gn b/services/ui/ws/BUILD.gn
index e24c44cf1a4dcb52440856730d9aac09c431677f..849d3f7bfb7933b30bc297c304f6cc5909efc6de 100644
--- a/services/ui/ws/BUILD.gn
+++ b/services/ui/ws/BUILD.gn
@@ -221,14 +221,9 @@ static_library("test_support") {
   ]
 }
 
-group("tests") {
+source_set("tests") {
   testonly = true
-  deps = [
-    ":ui_service_unittests",
-  ]
-}
 
-service_test("ui_service_unittests") {
   sources = [
     "cursor_location_manager_unittest.cc",
     "cursor_state_unittest.cc",
@@ -267,8 +262,6 @@ service_test("ui_service_unittests") {
     sources += [ "platform_display_default_unittest.cc" ]
   }
 
-  catalog = ":ui_service_unittests_catalog"
-
   deps = [
     ":lib",
     ":test_support",
@@ -300,13 +293,12 @@ service_test("ui_service_unittests") {
   ]
 }
 
-service_manifest("ui_service_unittests_app_manifest") {
-  name = "ui_service_unittests_app"
-  source = "ui_service_unittests_app_manifest.json"
+service_manifest("unittests_manifest") {
+  name = "ui_service_unittests"
+  source = "test_manifest.json"
 }
 
-catalog("ui_service_unittests_catalog") {
-  embedded_services = [ ":ui_service_unittests_app_manifest" ]
-
-  standalone_services = [ "//services/ui:manifest" ]
+catalog("tests_catalog") {
+  testonly = true
+  embedded_services = [ ":unittests_manifest" ]
 }