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

ui/events/devices/device_data_manager.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/device_data_manager.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/events/devices/input_device_event_observer.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point3_f.h"
 
 namespace ui {
 
 namespace {
 
 bool InputDeviceEquals(const ui::InputDevice& a, const ui::InputDevice& b) {
   return a.id == b.id;
 }
 
 }  // namespace
 
 // static
 DeviceDataManager* DeviceDataManager::instance_ = NULL;
 
 DeviceDataManager::DeviceDataManager() {
-  CHECK(!instance_) << "Can not create multiple instances of DeviceDataManager";
-  instance_ = this;
-
-  base::AtExitManager::RegisterTask(
-      base::Bind(&base::DeletePointer<DeviceDataManager>, this));
-
   ClearTouchDeviceAssociations();
 }
 
 DeviceDataManager::~DeviceDataManager() {
-  CHECK_EQ(this, instance_);
-  instance_ = NULL;
 }
 
 // static
 DeviceDataManager* DeviceDataManager::instance() { return instance_; }
 
+void DeviceDataManager::set_instance(DeviceDataManager* instance) {
+  instance_ = instance;
+}
+
 // static
 void DeviceDataManager::CreateInstance() {
   if (instance())
     return;
 
-  new DeviceDataManager();
+  CHECK(!instance_) << "Can not create multiple instances of DeviceDataManager";

[sadrul, 2015/06/24 19:50:13]

This check should be in set_instance above, right?

[bruthig, 2015/06/24 21:52:59]

Done.

+  instance_ = new DeviceDataManager();
+
+  base::AtExitManager::RegisterTask(base::Bind(DeleteInstance));
+}
+
+void DeviceDataManager::DeleteInstance() {
+  if (instance_) {
+    delete instance_;
+    instance_ = NULL;
+  }
 }
 
 // static
 DeviceDataManager* DeviceDataManager::GetInstance() {
   CHECK(instance_) << "DeviceDataManager was not created.";
   return instance_;
 }
 
 // static
 bool DeviceDataManager::HasInstance() {
@@ skipping 125 matching lines @@
 
 void DeviceDataManager::AddObserver(InputDeviceEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceDataManager::RemoveObserver(InputDeviceEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ui