Converts mash_wm_apptests to unit tests

mash/wm/BUILD.gn

 # Copyright 2015 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("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/repack.gni")
 
-group("tests") {
-  testonly = true
-  deps = [
-    ":apptests",
-  ]
-}
-
 source_set("lib") {
   sources = [
     "accelerator_registrar_impl.cc",
     "accelerator_registrar_impl.h",
     "background_layout.cc",
     "background_layout.h",
     "fill_layout.cc",
     "fill_layout.h",
     "frame/caption_buttons/caption_button_types.h",
     "frame/caption_buttons/frame_caption_button.cc",
@@ skipping 105 matching lines @@
   output = "$root_out_dir/mash_wm_resources.pak"
   deps = [
     "//mash/wm/resources",
     "//ui/resources",
     "//ui/strings",
     "//ui/views/mus:resources",
     "//ui/views/resources",
   ]
 }
 
-mojo_native_application("apptests") {
-  output_name = "mash_wm_apptests"
-  testonly = true
-
-  sources = [
-    "accelerator_registrar_apptest.cc",
-    "window_manager_apptest.cc",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_config",
-    "//components/mus/public/cpp",
-    "//components/mus/public/interfaces",
-    "//mojo/common:common_base",
-    "//mojo/converters/geometry",
-    "//mojo/converters/input_events",
-    "//mojo/shell/public/cpp:sources",
-    "//mojo/shell/public/cpp:test_support",
-    "//ui/mojo/geometry:interfaces",
-    "//ui/mojo/geometry:util",
-  ]
-
-  data_deps = [
-    ":apptest_manifest",
-    ":wm",
-  ]
-
-  if (use_x11) {
-    deps += [ "//tools/xdisplaycheck" ]
-  }
-}
-
-mojo_application_manifest("apptest_manifest") {
-  application_name = "mash_wm_apptests"
-  source = "apptest_manifest.json"
-}
-
 source_set("unittests") {
   testonly = true
 
   sources = [
+    "accelerator_registrar_unittest.cc",
     "frame/move_loop_unittest.cc",
     "layout_manager_unittest.cc",
+    "window_manager_unittest.cc",
   ]
 
   deps = [
     ":lib",
     "//base",
     "//base/test:test_config",
     "//components/mus/public/cpp",
     "//components/mus/public/cpp/tests:unittest_support",
+    "//components/mus/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/edk/system",
     "//mojo/gles2",
     "//mojo/platform_handle",
     "//mojo/public/cpp/system",
+    "//mojo/shell/public/cpp:shell_test_support",
     "//testing/gtest",
     "//ui/base",
     "//ui/events",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
 }