Move touchscreen_util.cc/h from ash to ui.

ui/display/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")
 
 component("display") {
   sources = [
     "chromeos/apply_content_protection_task.cc",
     "chromeos/apply_content_protection_task.h",
     "chromeos/configure_displays_task.cc",
     "chromeos/configure_displays_task.h",
     "chromeos/display_configurator.cc",
     "chromeos/display_configurator.h",
     "chromeos/display_layout_manager.h",
     "chromeos/display_snapshot_virtual.cc",
     "chromeos/display_snapshot_virtual.h",
     "chromeos/display_util.cc",
     "chromeos/display_util.h",
     "chromeos/query_content_protection_task.cc",
     "chromeos/query_content_protection_task.h",
+    "chromeos/touchscreen_util.cc",
+    "chromeos/touchscreen_util.h",
     "chromeos/update_display_configuration_task.cc",
     "chromeos/update_display_configuration_task.h",
     "display.cc",
     "display.h",
     "display_change_notifier.cc",
     "display_change_notifier.h",
     "display_export.h",
     "display_finder.cc",
     "display_finder.h",
     "display_list.cc",
@@ skipping 41 matching lines @@
 
   public_deps = [
     "//ui/display/types",
     "//ui/gfx:gfx",
   ]
 
   deps = [
     "//base",
     "//third_party/re2",
     "//ui/display/util",
+    "//ui/events/devices",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
   if (is_chromeos && use_x11) {
     sources += [
       "chromeos/x11/display_mode_x11.cc",
       "chromeos/x11/display_mode_x11.h",
       "chromeos/x11/display_snapshot_x11.cc",
       "chromeos/x11/display_snapshot_x11.h",
@@ skipping 84 matching lines @@
   ]
 }
 
 # This test covers all testable components in display.
 test("display_unittests") {
   sources = [
     "chromeos/apply_content_protection_task_unittest.cc",
     "chromeos/configure_displays_task_unittest.cc",
     "chromeos/display_configurator_unittest.cc",
     "chromeos/query_content_protection_task_unittest.cc",
+    "chromeos/touchscreen_util_unittest.cc",
     "chromeos/update_display_configuration_task_unittest.cc",
-    "chromeos/x11/display_util_x11_unittest.cc",
-    "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
     "display_change_notifier_unittest.cc",
     "display_list_unittest.cc",
     "display_unittest.cc",
     "fake_display_snapshot_unittests.cc",
     "manager/display_layout_builder_unittest.cc",
     "manager/display_layout_unittest.cc",
     "manager/display_manager_utilities_unittest.cc",
     "manager/managed_display_info_unittest.cc",
     "screen_unittest.cc",
     "util/display_util_unittest.cc",
     "util/edid_parser_unittest.cc",
     "win/scaling_util_unittest.cc",
     "win/screen_win_unittest.cc",
   ]
 
   deps = [
     ":display",
+    ":display_manager_test_api",
     ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/display/types",
     "//ui/display/util",
+    "//ui/events/devices",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
   ]
 
   if (is_android) {
     # Do not run display_change_notifier_unittest.cc on Android because it
     # does not compile display_observer.cc
     sources -= [ "display_change_notifier_unittest.cc" ]
   }
 
-  if (is_chromeos && use_ozone) {
-    sources -= [
+  if (is_chromeos && use_x11) {
+    sources += [
       "chromeos/x11/display_util_x11_unittest.cc",
       "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
     ]
   }
 }