Move ui_services_unittests into service_unittest.

services/BUILD.gn

Index: services/BUILD.gn
diff --git a/services/BUILD.gn b/services/BUILD.gn
index b1007df9643094ddd034abbddd4341ac0c126f0e..558ecc2a285a15b3c5b39f2ff5b41b9e12256eeb 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -37,6 +37,10 @@ service_test("service_unittests") {
     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) {
@@ -82,6 +86,10 @@ catalog("service_unittests_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" ]
+    }
   }
 }