Fixed the Touchscreen.TouchEventsEnabled histogram to record the correct values on X11 and Ozone ba…

ui/events/events.gyp

 # Copyright 2013 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': [
     {
@@ skipping 289 matching lines @@
         '../gfx/gfx.gyp:gfx_geometry',
         'events',
         'events_base',
         'gesture_detection',
         'platform/events_platform.gyp:events_platform',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'test/cocoa_test_event_utils.h',
         'test/cocoa_test_event_utils.mm',
+        'test/device_data_manager_test_api.h',
         'test/event_generator.cc',
         'test/event_generator.h',
         'test/events_test_utils.cc',
         'test/events_test_utils.h',
         'test/events_test_utils_x11.cc',
         'test/events_test_utils_x11.h',
         'test/motion_event_test_utils.cc',
         'test/motion_event_test_utils.h',
         'test/platform_event_waiter.cc',
         'test/platform_event_waiter.h',
         'test/test_event_handler.cc',
         'test/test_event_handler.h',
         'test/test_event_processor.cc',
         'test/test_event_processor.h',
         'test/test_event_target.cc',
         'test/test_event_target.h',
         'test/test_event_targeter.cc',
         'test/test_event_targeter.h',
       ],
       'conditions': [
         ['OS=="ios"', {
           # The cocoa files don't apply to iOS.
           'sources/': [['exclude', 'cocoa']],
         }],
         ['use_x11==1', {
           'dependencies': [
             'devices/events_devices.gyp:events_devices',
           ],
         }],
+        ['use_x11==1 or use_ozone==1', {
+          'sources' : [
+              'test/device_data_manager_test_api_impl.cc',
+            ]
+        }, { # else use_x11=1 or use_ozone=1
+          'sources' : [
+              'test/device_data_manager_test_api_stub.cc',
+            ]
+        }],
       ],
     },
     {
       # GN version: //ui/events:events_unittests
       'target_name': 'events_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
         '<(DEPTH)/base/base.gyp:test_support_base',
@@ skipping 134 matching lines @@
               'dependencies': [
                 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }