Changed DeviceDataManager to be able to create multiple instances for the purposes of test.

ui/events/devices/x11/device_data_manager_x11.cc

 // Copyright 2014 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.
 
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
 #include <utility>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/sys_info.h"
 #include "ui/events/devices/keyboard_device.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/display.h"
@@ skipping 100 matching lines @@
 
 bool DeviceDataManagerX11::IsTouchDataType(const int type) {
   return (type >= kTouchDataTypeStart) && (type <= kTouchDataTypeEnd);
 }
 
 // static
 void DeviceDataManagerX11::CreateInstance() {
   if (instance())
     return;
 
-  new DeviceDataManagerX11();
+  DeviceDataManagerX11* device_data_manager = new DeviceDataManagerX11();
+  base::AtExitManager::RegisterTask(
+      base::Bind(&base::DeletePointer<DeviceDataManager>, device_data_manager));

[sadrul, 2015/06/27 07:09:05]

Can we avoid setting a callback here, and explicitly call DDM::DeleteInstance()
instead? Looks like it would need to be called only in a few places?

+
+  set_instance(device_data_manager);
 }
 
 // static
 DeviceDataManagerX11* DeviceDataManagerX11::GetInstance() {
   return static_cast<DeviceDataManagerX11*>(DeviceDataManager::GetInstance());
 }
 
 DeviceDataManagerX11::DeviceDataManagerX11()
     : xi_opcode_(-1),
       atom_cache_(gfx::GetXDisplay(), kCachedAtoms),
@@ skipping 626 matching lines @@
     } else {
       keyboards.erase(it);
       ++blocked_iter;
     }
   }
   // Notify base class of updated list.
   DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
 }
 
 }  // namespace ui