Move more mus tests to service_unittest.

services/ui/ws/BUILD.gn

 # Copyright 2014 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("//testing/test.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//services/service_manager/public/tools/test/service_test.gni")
@@ skipping 208 matching lines @@
     "//ui/gl",
     "//ui/wm",
   ]
 }
 
 group("tests") {
   testonly = true
   deps = [
     ":ui_service_unittests",
   ]
-  if (!is_android) {
-    deps += [ "//services/ui/public/cpp/tests:mus_public_unittests" ]
-  }
 }
 
 service_test("ui_service_unittests") {
   sources = [
     "cursor_location_manager_unittest.cc",
     "cursor_state_unittest.cc",
     "cursor_unittest.cc",
     "display_unittest.cc",
     "drag_controller_unittest.cc",
     "event_dispatcher_unittest.cc",
@@ skipping 64 matching lines @@
 service_manifest("ui_service_unittests_app_manifest") {
   name = "ui_service_unittests_app"
   source = "ui_service_unittests_app_manifest.json"
 }
 
 catalog("ui_service_unittests_catalog") {
   embedded_services = [ ":ui_service_unittests_app_manifest" ]
 
   standalone_services = [ "//services/ui:manifest" ]
 }