Move touchscreen device caching to DeviceDataManager

ui/display/display.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       # GN version: //ui/display/types
       'target_name': 'display_types',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../ui/gfx/gfx.gyp:gfx_geometry',
       ],
       'defines': [
         'DISPLAY_TYPES_IMPLEMENTATION',
       ],
       'sources': [
         # Note: file list duplicated in GN build.
         'types/chromeos/display_mode.cc',
         'types/chromeos/display_mode.h',
         'types/chromeos/display_snapshot.cc',
         'types/chromeos/display_snapshot.h',
         'types/chromeos/native_display_delegate.h',
         'types/chromeos/native_display_observer.h',
-        'types/chromeos/touchscreen_device.cc',
-        'types/chromeos/touchscreen_device.h',
-        'types/chromeos/touchscreen_device_manager.h',
         'types/display_constants.h',
         'types/display_types_export.h',
       ],
     },
     {
       # GN version: //ui/display
       'target_name': 'display',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
@@ skipping 15 matching lines @@
         'chromeos/x11/display_mode_x11.cc',
         'chromeos/x11/display_mode_x11.h',
         'chromeos/x11/display_snapshot_x11.cc',
         'chromeos/x11/display_snapshot_x11.h',
         'chromeos/x11/display_util_x11.cc',
         'chromeos/x11/display_util_x11.h',
         'chromeos/x11/native_display_delegate_x11.cc',
         'chromeos/x11/native_display_delegate_x11.h',
         'chromeos/x11/native_display_event_dispatcher_x11.cc',
         'chromeos/x11/native_display_event_dispatcher_x11.h',
-        'chromeos/x11/touchscreen_device_manager_x11.cc',
-        'chromeos/x11/touchscreen_device_manager_x11.h',
         'display_export.h',
         'display_switches.cc',
         'display_switches.h',
       ],
       'conditions': [
         ['use_x11 == 1', {
           'dependencies': [
             '../../build/linux/system.gyp:x11',
             '../../build/linux/system.gyp:xext',
             '../../build/linux/system.gyp:xi',
             '../../build/linux/system.gyp:xrandr',
+            '../../ui/events/events.gyp:events_base',
             '../../ui/events/platform/events_platform.gyp:events_platform',
           ],
         }],
         ['chromeos == 1', {
           'dependencies': [
             'display_types',
           ],
         }],
         ['use_ozone == 1', {
           'dependencies': [
@@ skipping 82 matching lines @@
         'chromeos/x11/native_display_event_dispatcher_x11_unittest.cc',
         'util/display_util_unittest.cc',
         'util/edid_parser_unittest.cc',
       ],
       'conditions': [
         ['chromeos == 1', {
           'dependencies': [
             'display',
             'display_test_util',
             'display_types',
+            '../../ui/events/events.gyp:events_base',
           ],
         }],
       ],
     },
   ],
 }