Convert mus apptests to shelltests

components/mus/ws/BUILD.gn

Index: components/mus/ws/BUILD.gn
diff --git a/components/mus/ws/BUILD.gn b/components/mus/ws/BUILD.gn
index 8543f976af6d9bc4de80a95a3932c4909397c8e7..789c15602767c21ebecf3bde947bf598ceb5c0c8 100644
--- a/components/mus/ws/BUILD.gn
+++ b/components/mus/ws/BUILD.gn
@@ -132,12 +132,13 @@ source_set("test_support") {
 group("tests") {
   testonly = true
   deps = [
-    ":apptests",
     ":window_manager_unittests",
   ]
   if (!is_android) {
-    deps +=
-        [ "//components/mus/public/cpp/tests:mojo_view_manager_lib_unittests" ]
+    deps += [
+      ":window_manager_shelltests",
+      "//components/mus/public/cpp/tests:mojo_view_manager_lib_unittests",
+    ]
   }
 }
 
@@ -192,18 +193,15 @@ test("window_manager_unittests") {
   }
 }
 
-mojo_native_application("apptests") {
-  output_name = "mus_apptests"
-  testonly = true
-
+test("window_manager_shelltests") {

[Ben Goodger (Google), 2016/03/08 18:07:23]

rather than calling these out as a separate test suite, I think you can just
merge these files into window_manager_unittests.

window_manager_unittests should probably be called mus_ws_unittests

   sources = [
-    "window_manager_client_apptest.cc",
-    "window_tree_apptest.cc",
+    "window_manager_client_shelltest.cc",
+    "window_tree_shelltest.cc",
   ]
 
   deps = [
-    ":manifest",
     ":test_support",
+    ":window_manager_shelltests_manifest",
     "//base",
     "//base/test:test_config",
     "//components/mus/common:mus_common",
@@ -211,24 +209,23 @@ mojo_native_application("apptests") {
     "//components/mus/public/cpp/tests:test_support",
     "//components/mus/public/interfaces",
     "//mojo/converters/geometry",
+    "//mojo/shell/public/cpp:shell_test_support",
     "//mojo/shell/public/cpp:sources",
     "//mojo/shell/public/cpp:test_support",
+    "//mojo/shell/public/cpp/test:run_all_shelltests",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
+    "//ui/gl",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
 
-  data_deps = [
-    ":lib",
-  ]
-
   if (use_x11) {
     deps += [ "//tools/xdisplaycheck" ]
   }
 }
 
-mojo_application_manifest("manifest") {
-  application_name = "mus_apptests"
-  source = "apptest_manifest.json"
+mojo_application_manifest("window_manager_shelltests_manifest") {
+  application_name = "window_manager_shelltests_app"
+  source = "window_manager_shelltests_app_manifest.json"
 }