Extract touchscreen device management into a generic manager

ui/events/test/events_test_utils_x11.h

 // 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.
 
 #ifndef UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 #define UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/events/x/device_data_manager.h"
+#include "ui/events/x/device_data_manager_x11.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/x/x11_types.h"
 
 typedef union _XEvent XEvent;
 
 namespace ui {
 
 struct Valuator {
-  Valuator(DeviceDataManager::DataType type, double v)
+  Valuator(DeviceDataManagerX11::DataType type, double v)
       : data_type(type), value(v) {}
 
-  DeviceDataManager::DataType data_type;
+  DeviceDataManagerX11::DataType data_type;
   double value;
 };
 
 struct XEventDeleter {
   void operator()(XEvent* event);
 };
 
 class ScopedXI2Event {
  public:
   ScopedXI2Event();
@@ skipping 49 matching lines @@
 
 // Initializes a test touchpad device for scroll events.
 void SetUpTouchPadForTest(unsigned int deviceid);
 
 // Initializes a list of touchscreen devices for touch events.
 void SetUpTouchDevicesForTest(const std::vector<unsigned int>& devices);
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_TEST_EVENTS_TEST_UTILS_X11_H_