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

ui/events/test/device_data_manager_test_api.h

Index: ui/events/test/device_data_manager_test_api.h
diff --git a/ui/events/test/device_data_manager_test_api.h b/ui/events/test/device_data_manager_test_api.h
new file mode 100644
index 0000000000000000000000000000000000000000..151ef5b2b28c03703b4ba7761cdbadc58afc2a36
--- /dev/null
+++ b/ui/events/test/device_data_manager_test_api.h
@@ -0,0 +1,43 @@
+// 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.
+
+#ifndef UI_EVENTS_TEST_DEVICE_DATA_MANAGER_TEST_API_H_
+#define UI_EVENTS_TEST_DEVICE_DATA_MANAGER_TEST_API_H_
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/events_devices_export.h"
+
+namespace ui {
+namespace test {
+
+// Test API class to access internals of the DeviceDataManager class.
+class DeviceDataManagerTestAPI {
+ public:
+  explicit DeviceDataManagerTestAPI(DeviceDataManager* device_data_manager);
+  ~DeviceDataManagerTestAPI();
+
+  // Wrapper functions to DeviceDataManager.
+  static scoped_ptr<DeviceDataManager> CreateDeviceDataManager();
+  static void SetDeviceDataManagerInstance(DeviceDataManager* instance);
+
+  void NotifyObserversTouchscreenDeviceConfigurationChanged();
+  void NotifyObserversKeyboardDeviceConfigurationChanged();
+  void NotifyObserversMouseDeviceConfigurationChanged();
+  void NotifyObserversTouchpadDeviceConfigurationChanged();
+  void NotifyObserversDeviceListsComplete();
+  void OnDeviceListsComplete();
+
+ private:
+  // The instance to provide internal access to. Not owned.
+  DeviceDataManager* device_data_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(DeviceDataManagerTestAPI);
+};
+
+}  // namespace test
+}  // namespace ui
+
+#endif  // UI_EVENTS_TEST_DEVICE_DATA_MANAGER_TEST_API_H_