Move more mus tests to service_unittest.

services/ui/ime/BUILD.gn

Index: services/ui/ime/BUILD.gn
diff --git a/services/ui/ime/BUILD.gn b/services/ui/ime/BUILD.gn
index 95c752222166cca07fb4736a61687d78ad386303..47b192885cb492b0fc90acc3d905613f9eb59688 100644
--- a/services/ui/ime/BUILD.gn
+++ b/services/ui/ime/BUILD.gn
@@ -25,20 +25,13 @@ source_set("lib") {
   ]
 }
 
-group("tests") {
+source_set("tests") {
   testonly = true
-  deps = [
-    ":mus_ime_unittests",
-  ]
-}
 
-service_test("mus_ime_unittests") {
   sources = [
     "ime_unittest.cc",
   ]
 
-  catalog = ":mus_ime_unittests_catalog"
-
   deps = [
     "//base",
     "//mojo/common",
@@ -54,15 +47,13 @@ service_test("mus_ime_unittests") {
   ]
 }
 
-service_manifest("test_manifest") {
-  name = "mus_ime_unittests"
+service_manifest("unittest_manifest") {
+  name = "ime_unittests"
   source = "test_manifest.json"
 }
 
-catalog("mus_ime_unittests_catalog") {
-  embedded_services = [ ":test_manifest" ]
-  standalone_services = [
-    "//services/ui:manifest",
-    "//services/ui/ime/test_ime_driver:manifest",
-  ]
+catalog("tests_catalog") {
+  testonly = true
+  embedded_services = [ ":unittest_manifest" ]
+  standalone_services = [ "//services/ui/ime/test_ime_driver:manifest" ]
 }