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 19869754c56b53570491bcdc715469cb1b407384..6f8a090ce5d3d2a7f61fa9793c1b4772bb2f5a7d 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
@@ -24,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;
@@ -47,6 +52,11 @@ class ChromeOSMetricsProviderTest : public testing::Test {
 
  protected:
   virtual void SetUp() OVERRIDE {
+#if defined(USE_X11)
+    // AtExitManager keeps track of its lifetime.
+    new ui::DeviceDataManagerX11();
+#endif
+
     // Set up the fake Bluetooth environment,
     scoped_ptr<FakeDBusThreadManager> fake_dbus_thread_manager(
         new FakeDBusThreadManager);
@@ -93,6 +103,7 @@ class ChromeOSMetricsProviderTest : public testing::Test {
   FakeBluetoothDeviceClient* fake_bluetooth_device_client_;
 
  private:
+  base::ShadowingAtExitManager at_exit_;

[sadrul, 2014/06/16 14:48:37]

Requiring all tests that use the DDMX11 to have a ShadowingAtExitManager seems
like an extra burden. Can we remove this?

[dnicoara, 2014/06/16 15:13:56]

Only if DeviceDataManager allows calling CreateInstance() (soon to be
introduced) multiple times, rather than performing the CHECK in
DeviceDataManager's constructor. I was under the impression you didn't like this
approach.

[sadrul, 2014/06/17 20:37:08]

We should avoid calling CreateInstance() from too many places. But calling them
multiple times doesn't sound bad. (of course, given that only the first call
actually creates a new instance, and subsequent calls are no-ops)

[dnicoara, 2014/06/18 14:04:29]

Done.

   content::TestBrowserThreadBundle thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeOSMetricsProviderTest);