Extract touchscreen device management into a generic manager

chrome/browser/metrics/chromeos_metrics_provider_unittest.cc

Index: chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
index b2887c0c52fdb42f6856dd89e5ad753b5660405d..21f5e1616876177bd9bc74763311ab15c4c1b0fc 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
@@ -25,6 +25,10 @@
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(USE_X11)
+#include "ui/events/x/device_data_manager_x11.h"
+#endif
+
 using chromeos::DBusThreadManager;
 using chromeos::BluetoothAdapterClient;
 using chromeos::BluetoothAgentManagerClient;
@@ -50,6 +54,10 @@ class ChromeOSMetricsProviderTest : public testing::Test {
 
  protected:
   virtual void SetUp() OVERRIDE {
+#if defined(USE_X11)
+    ui::DeviceDataManagerX11::CreateInstance();

[sadrul, 2014/06/20 13:37:52]

Is this necessary?

[dnicoara, 2014/06/20 14:48:00]

Unfortunately it is. I double-checked.

+#endif
+
     // Set up the fake Bluetooth environment,
     scoped_ptr<FakeDBusThreadManager> fake_dbus_thread_manager(
         new FakeDBusThreadManager);