Extract touchscreen device management into a generic manager

chrome/browser/chromeos/device_uma.cc

Index: chrome/browser/chromeos/device_uma.cc
diff --git a/chrome/browser/chromeos/device_uma.cc b/chrome/browser/chromeos/device_uma.cc
index b7c85fe581d6ecd74a87809736b56c771122edbc..41ec2d4912494cf6a8c65471a500818cdbd5d684 100644
--- a/chrome/browser/chromeos/device_uma.cc
+++ b/chrome/browser/chromeos/device_uma.cc
@@ -13,7 +13,7 @@
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/platform/platform_event_source.h"
-#include "ui/events/x/device_data_manager.h"
+#include "ui/events/x/device_data_manager_x11.h"
 
 // Enum type for CrOS gesture lib UMA
 enum UMACrosGestureMetricsType{
@@ -66,7 +66,7 @@ void DeviceUMA::CheckTouchpadEvent(XEvent* native_event) {
                             UMA_CROS_GESTURE_METRICS_COUNT);
 
   // Check for the CrOS touchpad metrics gesture
-  ui::DeviceDataManager *manager = ui::DeviceDataManager::GetInstance();
+  ui::DeviceDataManagerX11 *manager = ui::DeviceDataManagerX11::GetInstance();
   if (manager->IsCMTMetricsEvent(native_event)) {
     ui::GestureMetricsType type;
     float data1, data2;
@@ -85,7 +85,7 @@ void DeviceUMA::CheckTouchpadEvent(XEvent* native_event) {
 void DeviceUMA::CheckIncomingEvent(XEvent* event) {
   switch (event->type) {
     case GenericEvent: {
-      if (ui::DeviceDataManager::GetInstance()->IsXIDeviceEvent(event) &&
+      if (ui::DeviceDataManagerX11::GetInstance()->IsXIDeviceEvent(event) &&
           ui::IsTouchpadEvent(event))
         CheckTouchpadEvent(event);
       break;