Move more tests suites to services_unittests.

services/resource_coordinator/BUILD.gn

Index: services/resource_coordinator/BUILD.gn
diff --git a/services/resource_coordinator/BUILD.gn b/services/resource_coordinator/BUILD.gn
index a6e27e3e318a90d174c754fa6b78106f7a7436f0..6b03a813054f201cf0815362e28e9e88e8fe07b2 100644
--- a/services/resource_coordinator/BUILD.gn
+++ b/services/resource_coordinator/BUILD.gn
@@ -58,33 +58,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",
@@ -93,6 +76,7 @@ service_test("resource_coordinator_unittests") {
 
   data_deps = [
     ":resource_coordinator",
+    ":lib",
   ]
 }
 
@@ -101,7 +85,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" ]
 }