Move touchscreen_util.cc/h from ash to ui.

ui/display/chromeos/touchscreen_util.h

Index: ui/display/chromeos/touchscreen_util.h
diff --git a/ash/touch/touchscreen_util.h b/ui/display/chromeos/touchscreen_util.h
similarity index 67%
rename from ash/touch/touchscreen_util.h
rename to ui/display/chromeos/touchscreen_util.h
index 8d2f04c013cc7f8e0516652217a45b74ca02e732..2edb410a3778db5ad242748a5aa190ff63df902d 100644
--- a/ash/touch/touchscreen_util.h
+++ b/ui/display/chromeos/touchscreen_util.h
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_TOUCH_TOUCHSCREEN_UTIL_H_
-#define ASH_TOUCH_TOUCHSCREEN_UTIL_H_
+#ifndef UI_DISPLAY_CHROMEOS_TOUCHSCREEN_UTIL_H_
+#define UI_DISPLAY_CHROMEOS_TOUCHSCREEN_UTIL_H_
 
 #include <vector>
 
-#include "ash/ash_export.h"
+#include "ui/display/display_export.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/events/devices/touchscreen_device.h"
 
-namespace ash {
+namespace display {
 
 // Given a list of displays and a list of touchscreens, associate them. The
 // information in |displays| will be updated to reflect the mapping.
-ASH_EXPORT void AssociateTouchscreens(
+DISPLAY_EXPORT void AssociateTouchscreens(
     std::vector<display::ManagedDisplayInfo>* displays,
     const std::vector<ui::TouchscreenDevice>& touchscreens);
 
-}  // namespace ash
+}  // namespace display
 
-#endif  // ASH_TOUCH_TOUCHSCREEN_UTIL_H_
+#endif  // UI_DISPLAY_CHROMEOS_TOUCHSCREEN_UTIL_H_