Move display_service_unittests to services_unittests.

services/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/tools/test/service_test.gni")
 import("//testing/test.gni")
 
 # One Big Target for services to register their unit test sources. This exists
@@ skipping 35 matching lines @@
       # Some tests need to initialize V8.
       "//v8:v8_external_startup_data_assets",
     ]
   } else {
     # NOTE: We do not currently support standalone service binaries on Android,
     # so any tests which use the ServiceTest framework to connect to standalone
     # services must be added here.
     deps += [ "//services/video_capture:tests" ]
   }
 
+  if (use_ozone && is_chromeos) {
+    deps += [ "//services/ui/display:tests" ]
+  }
+
+  test_runner = "//services/test:run_all_service_tests"
+
   catalog = ":service_unittests_catalog"
 }
 
 catalog("service_unittests_catalog") {
   testonly = true
   catalog_deps = [
     "//services/device:tests_catalog",
     "//services/identity:tests_catalog",
     "//services/preferences:tests_catalog",
     "//services/resource_coordinator:tests_catalog",
@@ skipping 31 matching lines @@
       "//mojo/public/java:bindings_java",
       "//mojo/public/java:system_java",
       "//services/device/nfc/android:java",
       "//services/device/public/interfaces:interfaces_java",
       "//services/device/public/java:nfc_java",
       "//services/shape_detection:shape_detection_java",
       "//third_party/android_tools:android_support_annotations_java",
     ]
   }
 }