Move more tests suites to services_unittests.

services/ui/gpu/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("//build/config/ui.gni")
+import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 source_set("gpu") {
   output_name = "mus_gpu"
 
   sources = [
     "gpu_main.cc",
     "gpu_main.h",
     "gpu_service.cc",
@@ skipping 18 matching lines @@
     "//services/ui/surfaces",
     "//ui/gfx:memory_buffer",
     "//ui/gl/init",
   ]
 
   if (use_ozone) {
     deps += [ "//ui/ozone:ozone" ]
   }
 }
 
-group("tests") {
-  testonly = true
-  deps = [
-    ":mus_gpu_unittests",
-  ]
+if (use_aura) {
+  source_set("tests") {
+    testonly = true
+
+    sources = [
+      "gpu_service_unittest.cc",
+    ]
+
+    deps = [
+      ":gpu",
+      "//base",
+      "//gpu",
+      "//ipc",
+      "//services/ui/gpu/interfaces",
+      "//testing/gtest",
+      "//ui/gfx:memory_buffer",
+      "//ui/gfx/geometry",
+    ]
+
+    data_deps = [
+      "//services/ui",
+    ]
+  }
+
+  service_manifest("unittest_manifest") {
+    name = "mus_gpu_unittests"
+    source = "test_manifest.json"
+  }
+
+  catalog("tests_catalog") {
+    testonly = true
+    embedded_services = [ ":unittest_manifest" ]
+  }
 }
-
-test("mus_gpu_unittests") {
-  deps = [
-    ":gpu",
-    "//base",
-    "//gpu",
-    "//ipc",
-    "//services/ui/common:run_all_service_tests",
-    "//services/ui/gpu/interfaces",
-    "//testing/gtest",
-    "//ui/gfx:memory_buffer",
-    "//ui/gfx/geometry",
-  ]
-
-  sources = [
-    "gpu_service_unittest.cc",
-  ]
-}
-
-service_manifest("mus_gpu_unittests_app_manifest") {
-  name = "mus_gpu_unittests_app"
-  source = "mus_gpu_unittests_app_manifest.json"
-}