Disable unit tests for Window Manager Client in external window mode

services/ui/ws/BUILD.gn

Index: services/ui/ws/BUILD.gn
diff --git a/services/ui/ws/BUILD.gn b/services/ui/ws/BUILD.gn
index 7408a083aa3096666fb3d6b3e14aa045de381222..ff9afcff24e1d96c73e4c1918c1871d2c08a3b51 100644
--- a/services/ui/ws/BUILD.gn
+++ b/services/ui/ws/BUILD.gn
@@ -171,10 +171,18 @@ static_library("test_support") {
     "test_change_tracker.h",
     "window_server_service_test_base.cc",
     "window_server_service_test_base.h",
-    "window_server_test_base.cc",
-    "window_server_test_base.h",
   ]
 
+  if (!use_ozone || is_chromeos) {

[kylechar, 2017/03/09 15:26:28]

Add a variable that you can reuse for this.

is_external_mode = use_ozone && !is_chromeos

+    # WindowServerTestBase assumes an initial display (and root) is provided
+    # at startup, which is not the case on platforms running external window
+    # mode.
+    sources = [
+      "window_server_test_base.cc",
+      "window_server_test_base.h",
+    ]
+  }
+
   deps = [
     "//base",
     "//base/test:test_config",
@@ -223,12 +231,17 @@ service_test("mus_ws_unittests") {
     "user_display_manager_unittest.cc",
     "window_coordinate_conversions_unittest.cc",
     "window_finder_unittest.cc",
-    "window_manager_client_unittest.cc",
     "window_manager_state_unittest.cc",
     "window_tree_client_unittest.cc",
     "window_tree_unittest.cc",
   ]
 
+  if (!use_ozone || is_chromeos) {
+    # A window manager client is not needed on platforms running external
+    # window mode, since the host system is always the window manager.
+    sources += [ "window_manager_client_unittest.cc" ]
+  }
+
   catalog = ":mus_ws_unittests_catalog"
 
   deps = [