Disable unit tests for Window Manager Client in external window mode

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")
 
+is_external_mode = use_ozone && !is_chromeos

[msw, 2017/03/09 16:51:22]

nit: add a comment explaining what this is, eg. "The window server's external
window mode creates individual top-level native {x11, wayland, mir, ...}
windows, ie. not children of a Chrome OS window manager's root window." Feel
free to cleanup that comment, I had never heard of 'external mode' before
reading through the associated bug.

[fwang, 2017/03/09 21:52:49]

Done.

+
 static_library("lib") {
   sources = [
     "accelerator.cc",
     "accelerator.h",
     "access_policy.h",
     "access_policy_delegate.h",
     "accessibility_manager.cc",
     "accessibility_manager.h",
     "cursor_location_manager.cc",
     "cursor_location_manager.h",
@@ skipping 142 matching lines @@
 }
 
 static_library("test_support") {
   testonly = true
 
   sources = [
     "test_change_tracker.cc",
     "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 (!is_external_mode) {
+    # 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",
     "//mojo/common",
     "//mojo/public/cpp/bindings:bindings",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp:sources",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
@@ skipping 28 matching lines @@
     "server_window_drawn_tracker_unittest.cc",
     "test_server_window_delegate.cc",
     "test_server_window_delegate.h",
     "test_utils.cc",
     "test_utils.h",
     "transient_windows_unittest.cc",
     "user_activity_monitor_unittest.cc",
     "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 (!is_external_mode) {
+    # 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 = [
     ":lib",
     ":test_support",
     "//base",
     "//base/test:test_config",
     "//base/test:test_support",
     "//cc:cc",
     "//gpu/ipc/client",
@@ skipping 21 matching lines @@
 service_manifest("mus_ws_unittests_app_manifest") {
   name = "mus_ws_unittests_app"
   source = "mus_ws_unittests_app_manifest.json"
 }
 
 catalog("mus_ws_unittests_catalog") {
   embedded_services = [ ":mus_ws_unittests_app_manifest" ]
 
   standalone_services = [ "//services/ui:manifest" ]
 }