Move ui_services_unittests into service_unittest.

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 19 matching lines @@
       "//services/ui/gpu:tests",
       "//services/ui/ime:tests",
       "//services/ui/input_devices:tests",
       "//services/ui/public/cpp/tests",
       "//services/ui/public/interfaces:tests",
     ]
 
     if (is_linux && !is_chromeos) {
       deps += [ "//services/ui/demo:tests" ]
     }
+
+    if (use_ozone || !is_chromeos) {

[sky, 2017/05/26 21:50:36]

I think this means mac will start testing the window-server tests. I suspect
that won't work yet.

[Elliot Glaysher, 2017/05/26 21:59:35]

Looking at the logs, no, it's not running these tests, but I did add a (... &&
!is_mac) just in case that changes.

+      deps += [ "//services/ui/ws:tests" ]
+    }
   }
 
   if (is_android) {
     deps += [
       "//services/device:java",
 
       # Some tests need to initialize V8.
       "//v8:v8_external_startup_data_assets",
     ]
   } else {
@@ skipping 25 matching lines @@
   if (use_aura) {
     catalog_deps += [
       "//services/ui/clipboard:tests_catalog",
       "//services/ui/gpu:tests_catalog",
       "//services/ui/ime:tests_catalog",
     ]
 
     if (is_linux && !is_chromeos) {
       catalog_deps += [ "//services/ui/demo:tests_catalog" ]
     }
+
+    if (use_ozone || !is_chromeos) {
+      catalog_deps += [ "//services/ui/ws:tests_catalog" ]
+    }
   }
 }
 
 if (is_android) {
   junit_binary("service_junit_tests") {
     java_files = [
       "device/generic_sensor/android/junit/src/org/chromium/device/sensors/PlatformSensorAndProviderTest.java",
       "device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java",
       "shape_detection/android/junit/src/org/chromium/shape_detection/SharedBufferUtilsTest.java",
     ]
     deps = [
       "$google_play_services_package:google_play_services_base_java",
       "$google_play_services_package:google_play_services_basement_java",
       "$google_play_services_package:google_play_services_vision_common_java",
       "$google_play_services_package:google_play_services_vision_java",
       "//base:base_java",
       "//base:base_java_test_support",
       "//device/generic_sensor:java",
       "//device/generic_sensor/public/interfaces:interfaces_java",
       "//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",
     ]
   }
 }