Move more tests suites to services_unittests.

services/resource_coordinator/BUILD.gn

 # Copyright 2017 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.
 
 # There should be only one resource coordinator. It is currently
 # in the browser process. So, only //content/browser should link to this target.
 # Others modules should only need the public targets.
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
@@ skipping 40 matching lines @@
   testonly = true
 
   sources = [
     "coordination_unit/coordination_unit_impl_unittest.cc",
     "memory_instrumentation/coordinator_impl_unittest.cc",
     "memory_instrumentation/process_map_unittest.cc",
     "public/cpp/memory_instrumentation/client_process_impl_unittest.cc",
     "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",
     "//testing/gtest",
   ]
 
   data_deps = [
     ":resource_coordinator",
+    ":lib",
   ]
 }
 
 service_manifest("unittest_manifest") {
   name = "resource_coordinator_unittests"
   source = "unittest_manifest.json"
 }
 
-catalog("resource_coordinator_unittests_catalog") {
+catalog("tests_catalog") {
+  testonly = true
   embedded_services = [ ":unittest_manifest" ]
   standalone_services = [ ":manifest" ]
 }