Move more tests suites to services_unittests.

Moves the tests in mus_gpu_unittests and resource_coordinator_unittest
into services_unittests and remove references to the old targets.

BUG=722546

Review-Url: https://codereview.chromium.org/2901623002
Cr-Commit-Position: refs/heads/master@{#473983}

services/BUILD.gn

@@ -27,6 +27,7 @@ service_test("service_unittests") {
   if (use_aura) {
     deps += [
       "//services/ui/clipboard:tests",
+      "//services/ui/gpu:tests",
       "//services/ui/ime:tests",
       "//services/ui/input_devices:tests",
       "//services/ui/public/cpp/tests",
@@ -61,12 +62,14 @@ catalog("service_unittests_catalog") {
     "//services/device:tests_catalog",
     "//services/identity:tests_catalog",
     "//services/preferences:tests_catalog",
+    "//services/resource_coordinator:tests_catalog",
     "//services/video_capture:tests_catalog",
   ]
 
   if (use_aura) {
     catalog_deps += [
       "//services/ui/clipboard:tests_catalog",
+      "//services/ui/gpu:tests_catalog",
       "//services/ui/ime:tests_catalog",
     ]
 

services/resource_coordinator/BUILD.gn

@@ -66,33 +66,16 @@ source_set("tests") {
     "public/cpp/tracing/chrome_trace_event_agent_unittest.cc",
   ]
 
+  if (!is_android) {
+    sources += [ "resource_coordinator_service_unittest.cc" ]
+  }
+
   deps = [
     ":lib",
     "//base",
     "//base/test:test_support",
     "//mojo/public/cpp/bindings",
     "//services/resource_coordinator/public/cpp:resource_coordinator_cpp",
-    "//testing/gtest",
-  ]
-
-  data_deps = [
-    ":lib",
-  ]
-}
-
-service_test("resource_coordinator_unittests") {
-  testonly = true
-
-  sources = [
-    "resource_coordinator_service_unittest.cc",
-  ]
-
-  catalog = ":resource_coordinator_unittests_catalog"
-
-  deps = [
-    "//base",
-    "//mojo/public/cpp/bindings",
-    "//services/resource_coordinator/public/cpp:resource_coordinator_cpp",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/interfaces",
@@ -101,6 +84,7 @@ service_test("resource_coordinator_unittests") {
 
   data_deps = [
     ":resource_coordinator",
+    ":lib",
   ]
 }
 
@@ -109,7 +93,8 @@ service_manifest("unittest_manifest") {
   source = "unittest_manifest.json"
 }
 
-catalog("resource_coordinator_unittests_catalog") {
+catalog("tests_catalog") {
+  testonly = true
   embedded_services = [ ":unittest_manifest" ]
   standalone_services = [ ":manifest" ]
 }

services/ui/gpu/BUILD.gn

@@ -3,6 +3,7 @@
 # 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")
 
@@ -41,32 +42,37 @@ source_set("gpu") {
   }
 }
 
-group("tests") {
-  testonly = true
-  deps = [
-    ":mus_gpu_unittests",
-  ]
-}
+if (use_aura) {
+  source_set("tests") {
+    testonly = true
 
-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",
+    ]
 
-  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"
+  }
 
-service_manifest("mus_gpu_unittests_app_manifest") {
-  name = "mus_gpu_unittests_app"
-  source = "mus_gpu_unittests_app_manifest.json"
+  catalog("tests_catalog") {
+    testonly = true
+    embedded_services = [ ":unittest_manifest" ]
+  }
 }

services/ui/gpu/mus_gpu_unittests_app_manifest.json → services/ui/gpu/test_manifest.json

 {
-  "name": "mus_gpu_unittests_app",
+  "name": "mus_gpu_unittests",
   "display_name": "Mus GPU Unittests",
   "interface_provider_specs": {
     "service_manager:connector": {

testing/buildbot/chromium.chromiumos.json

@@ -299,12 +299,6 @@
         },
         "test": "mus_browser_tests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "mus_gpu_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/chromium.linux.json

@@ -3961,12 +3961,6 @@
         },
         "test": "mojo_system_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "mus_gpu_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -4625,12 +4619,6 @@
         },
         "test": "mojo_system_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "mus_gpu_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/chromium.win.json

@@ -297,12 +297,6 @@
         },
         "test": "mojo_system_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "mus_gpu_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/gn_isolate_map.pyl

@@ -754,10 +754,6 @@
     "label": "//mash:mash_unittests",
     "type": "windowed_test_launcher",
   },
-  "mus_gpu_unittests": {
-    "label": "//services/ui/gpu:mus_gpu_unittests",
-    "type": "console_test_launcher",
-  },
   "nacl_helper_nonsfi_unittests": {
     "label": "//components/nacl/loader:nacl_helper_nonsfi_unittests",
     "type": "raw",

tools/determinism/deterministic_build_whitelist.pyl

@@ -285,7 +285,6 @@
     'mojo_public_system_unittests.exe',
     'mojo_system_unittests.exe',
     'mus_demo_library.dll',
-    'mus_gpu_unittests.exe',
     'nacl_irt_x86_32.nexe',
     'nacl_irt_x86_64.nexe',
     'nacl_loader_unittests.exe',