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

ui/events/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")
 
 static_library("dom_keycode_converter") {
   sources = [
     "keycodes/dom/dom_code.h",
@@ skipping 221 matching lines @@
     sources += [ "gesture_detection/gesture_configuration_aura.cc" ]
   } else {
     sources += [ "gesture_detection/gesture_configuration_default.cc" ]
   }
 }
 
 source_set("test_support") {
   sources = [
     "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/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",
@@ skipping 27 matching lines @@
   if (use_x11) {
     sources += [
       "test/events_test_utils_x11.cc",
       "test/events_test_utils_x11.h",
     ]
     deps += [
       "//ui/events/devices",
       "//ui/gfx/x",
     ]
   }
+
+  if (use_x11 || use_ozone) {
+    sources += [ "test/device_data_manager_test_api_impl.cc" ]
+  } else {
+    sources += [ "test/device_data_manager_test_api_stub.cc" ]
+  }
 }
 
 test("events_unittests") {
   sources = [
     "android/scroller_unittest.cc",
     "cocoa/events_mac_unittest.mm",
     "devices/x11/device_data_manager_x11_unittest.cc",
     "event_dispatcher_unittest.cc",
     "event_processor_unittest.cc",
     "event_rewriter_unittest.cc",
@@ skipping 73 matching lines @@
 if (is_nacl) {
   source_set("latency_info") {
     sources = [
       "ipc/latency_info_param_traits.cc",
       "ipc/latency_info_param_traits.h",
       "latency_info.cc",
       "latency_info.h",
     ]
   }
 }