Pull buildtools to get GN 295140

ash/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/features.gni")
 import("//build/config/ui.gni")
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("ash.gyp") ],
@@ skipping 273 matching lines @@
   if (!is_chromeos) {
     sources -= [
       # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
       "focus_cycler_unittest.cc",
       # All tests for multiple displays: not supported on Windows Ash.
       "wm/drag_window_resizer_unittest.cc",
       # Can't resize on Windows Ash. http://crbug.com/165962
       "magnifier/magnification_controller_unittest.cc",
       "wm/workspace/workspace_window_resizer_unittest.cc",
       "sticky_keys/sticky_keys_overlay_unittest.cc",
-      "sticky_keys/sticky_keys_unittest.cc",
       "system/tray/media_security/multi_profile_media_tray_item_unittest.cc",
       "autoclick/autoclick_unittest.cc",
     ]
     sources += [
       #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',  TODO(GYP)
     ]
   }
 
   if (is_win) {
     cflags = [ "/wd4267" ]
   }
 
   if (!use_x11) {
     sources -= [
       "accelerators/magnifier_key_scroller_unittest.cc",
       "accelerators/spoken_feedback_toggler_unittest.cc",
-      "touch/touch_transformer_controller_unittest.cc",
     ]
   }
   if (is_chromeos) {
     sources += [ "first_run/first_run_helper_unittest.cc" ]
     deps += [
       "//device/bluetooth",
       "//ui/display",
       "//ui/display:test_util",
       "//ui/display/types",
       #'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',  TODO(GYP)
       #'../chromeos/chromeos.gyp:power_manager_proto',  TODO(GYP)
     ]
   } else {
     sources -= [
       "display/resolution_notification_controller_unittest.cc",
-      "touch/touch_transformer_controller_unittest.cc",
       "touch/touchscreen_util_unittest.cc",
     ]
   }
 
+  if (!use_x11 || !is_chromeos) {
+    sources -= [ "touch/touch_transformer_controller_unittest.cc", ]
+  }
+
   # TODO(GYP) is this necessary?
   #['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
   # ldflags = "-rdynamic"
 
-  if (use_ozone) {
+  if (!is_chromeos || use_ozone) {
     sources -= [
       "sticky_keys/sticky_keys_unittest.cc",  # crbug.com/354035
     ]
   }
 }
 
 executable("ash_shell") {
   testonly = true
   sources = [
     "shell/shell_main.cc",
@@ skipping 33 matching lines @@
     "//content/test:test_support",
     "//skia",
     "//testing/gtest",
     "//ui/accessibility",
   ]
 
   if (is_chromeos) {
     deps += [ "//ui/display" ]
   }
 }