Move ui_services_unittests into service_unittest.

services/ui/ws/BUILD.gn

 # Copyright 2014 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("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//services/catalog/public/tools/catalog.gni")
 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")
@@ skipping 203 matching lines @@
     "//services/ui/public/interfaces",
     "//testing/gtest",
     "//ui/aura",
     "//ui/display:test_support",
     "//ui/gfx/geometry/mojo",
     "//ui/gl",
     "//ui/wm",
   ]
 }
 
-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",
     "cursor_unittest.cc",
     "display_unittest.cc",
     "drag_controller_unittest.cc",
     "event_dispatcher_unittest.cc",
     "event_matcher_unittest.cc",
     "focus_controller_unittest.cc",
     "frame_generator_unittest.cc",
@@ skipping 18 matching lines @@
     # window mode, since the host system is always the window manager.
     sources += [ "window_manager_client_unittest.cc" ]
   }
 
   # TODO(jamescook): Run this test on non-ozone platforms. This will require
   # initializing all the platform-specific windowing support.
   if (use_ozone) {
     sources += [ "platform_display_default_unittest.cc" ]
   }
 
-  catalog = ":ui_service_unittests_catalog"
-
   deps = [
     ":lib",
     ":test_support",
     "//base",
     "//base/test:test_config",
     "//base/test:test_support",
     "//cc:cc",
     "//cc:test_support",
     "//gpu/ipc/client",
     "//mojo/public/cpp/bindings:bindings",
@@ skipping 11 matching lines @@
     "//ui/aura:test_support",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
     "//ui/gl",
   ]
 }
 
-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" ]
 }