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

ui/events/test/device_data_manager_test_api.cc

Index: ui/events/test/device_data_manager_test_api.cc
diff --git a/ui/events/test/device_data_manager_test_api.cc b/ui/events/test/device_data_manager_test_api.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bf0819a4248b7a1f407dcd244b415f77c7bebd01
--- /dev/null
+++ b/ui/events/test/device_data_manager_test_api.cc
@@ -0,0 +1,53 @@
+// Copyright 2015 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.
+
+#include "ui/events/test/device_data_manager_test_api.h"
+
+namespace ui {
+namespace test {
+
+scoped_ptr<DeviceDataManager>
+DeviceDataManagerTestAPI::CreateDeviceDataManager() {
+  return make_scoped_ptr(new DeviceDataManager);
+}
+
+void DeviceDataManagerTestAPI::SetDeviceDataManagerInstance(
+    DeviceDataManager* instance) {
+  DeviceDataManager::set_instance(instance);
+}
+
+DeviceDataManagerTestAPI::DeviceDataManagerTestAPI(
+    DeviceDataManager* device_data_manager)
+    : device_data_manager_(device_data_manager) {
+}
+
+DeviceDataManagerTestAPI::~DeviceDataManagerTestAPI() {
+}
+
+void DeviceDataManagerTestAPI::
+    NotifyObserversTouchscreenDeviceConfigurationChanged() {
+  device_data_manager_->NotifyObserversTouchscreenDeviceConfigurationChanged();
+}

[Alexei Svitkine (slow), 2015/07/07 22:00:59]

Nit: Add blank lines between functions.

[bruthig, 2015/07/08 20:29:52]

Done.  Weird, I don't know how those got removed....

+void DeviceDataManagerTestAPI::
+    NotifyObserversKeyboardDeviceConfigurationChanged() {
+  device_data_manager_->NotifyObserversKeyboardDeviceConfigurationChanged();
+}
+void DeviceDataManagerTestAPI::
+    NotifyObserversMouseDeviceConfigurationChanged() {
+  device_data_manager_->NotifyObserversMouseDeviceConfigurationChanged();
+}
+void DeviceDataManagerTestAPI::
+    NotifyObserversTouchpadDeviceConfigurationChanged() {
+  device_data_manager_->NotifyObserversTouchpadDeviceConfigurationChanged();
+}
+void DeviceDataManagerTestAPI::NotifyObserversDeviceListsComplete() {
+  device_data_manager_->NotifyObserversDeviceListsComplete();
+}
+
+void DeviceDataManagerTestAPI::OnDeviceListsComplete() {
+  device_data_manager_->OnDeviceListsComplete();
+}
+
+}  // namespace test
+}  // namespace ui