Fixed the Touchscreen.TouchEventsEnabled histogram to record the correct values on X11 and Ozone ba…

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"
@@ skipping 17 matching lines @@
   ClearTouchDeviceAssociations();
 }
 
 DeviceDataManager::~DeviceDataManager() {
 }
 
 // static
 DeviceDataManager* DeviceDataManager::instance() { return instance_; }
 
 void DeviceDataManager::set_instance(DeviceDataManager* instance) {
-  CHECK(!instance_) << "Can not set multiple instances of DeviceDataManager";
+  DCHECK(!instance || !instance_)
+      << "Can not set multiple instances of DeviceDataManager. Must explicitly "
+         "set to nullptr first.";

[sadrul, 2015/07/10 17:35:48]

This should be more like:

  DCHECK(instance) << "Must reset the DDM instance using DeleteInstance()
instead.";
  DCHECK(instance_) << "Cannot set multiple instances of DDM.";

[bruthig, 2015/07/10 20:04:58]

Done.

   instance_ = instance;
 }
 
 // static
 void DeviceDataManager::CreateInstance() {
   if (instance())
     return;
 
   set_instance(new DeviceDataManager());
 
+  // TODO(bruthig): Replace the DeleteInstance callbacks with explicit calls.
   base::AtExitManager::RegisterTask(base::Bind(DeleteInstance));
 }
 
 void DeviceDataManager::DeleteInstance() {
   if (instance_) {
     delete instance_;
     instance_ = NULL;
   }
 }
 
@@ skipping 66 matching lines @@
 void DeviceDataManager::OnTouchscreenDevicesUpdated(
     const std::vector<TouchscreenDevice>& devices) {
   if (devices.size() == touchscreen_devices_.size() &&
       std::equal(devices.begin(),
                  devices.end(),
                  touchscreen_devices_.begin(),
                  InputDeviceEquals)) {
     return;
   }
   touchscreen_devices_ = devices;
-  FOR_EACH_OBSERVER(InputDeviceEventObserver,
-                    observers_,
-                    OnTouchscreenDeviceConfigurationChanged());
+  NotifyObserversTouchscreenDeviceConfigurationChanged();
 }
 
 void DeviceDataManager::OnKeyboardDevicesUpdated(
     const std::vector<KeyboardDevice>& devices) {
   if (devices.size() == keyboard_devices_.size() &&
       std::equal(devices.begin(),
                  devices.end(),
                  keyboard_devices_.begin(),
                  InputDeviceEquals)) {
     return;
   }
   keyboard_devices_ = devices;
-  FOR_EACH_OBSERVER(InputDeviceEventObserver,
-                    observers_,
-                    OnKeyboardDeviceConfigurationChanged());
+  NotifyObserversKeyboardDeviceConfigurationChanged();
 }
 
 void DeviceDataManager::OnMouseDevicesUpdated(
     const std::vector<InputDevice>& devices) {
   if (devices.size() == mouse_devices_.size() &&
       std::equal(devices.begin(),
                  devices.end(),
                  mouse_devices_.begin(),
                  InputDeviceEquals)) {
     return;
   }
   mouse_devices_ = devices;
-  FOR_EACH_OBSERVER(InputDeviceEventObserver,
-                    observers_,
-                    OnMouseDeviceConfigurationChanged());
+  NotifyObserversMouseDeviceConfigurationChanged();
 }
 
 void DeviceDataManager::OnTouchpadDevicesUpdated(
     const std::vector<InputDevice>& devices) {
   if (devices.size() == touchpad_devices_.size() &&
       std::equal(devices.begin(),
                  devices.end(),
                  touchpad_devices_.begin(),
                  InputDeviceEquals)) {
     return;
   }
   touchpad_devices_ = devices;
-  FOR_EACH_OBSERVER(InputDeviceEventObserver,
-                    observers_,
-                    OnTouchpadDeviceConfigurationChanged());
+  NotifyObserversTouchpadDeviceConfigurationChanged();
 }
 
 void DeviceDataManager::OnDeviceListsComplete() {
   if (!device_lists_complete_) {
     device_lists_complete_ = true;
-    FOR_EACH_OBSERVER(InputDeviceEventObserver, observers_,
-                      OnDeviceListsComplete());
+    NotifyObserversDeviceListsComplete();
   }
 }
 
+void DeviceDataManager::NotifyObserversTouchscreenDeviceConfigurationChanged() {
+  FOR_EACH_OBSERVER(InputDeviceEventObserver, observers_,
+                    OnTouchscreenDeviceConfigurationChanged());
+}
+
+void DeviceDataManager::NotifyObserversKeyboardDeviceConfigurationChanged() {
+  FOR_EACH_OBSERVER(InputDeviceEventObserver, observers_,
+                    OnKeyboardDeviceConfigurationChanged());
+}
+
+void DeviceDataManager::NotifyObserversMouseDeviceConfigurationChanged() {
+  FOR_EACH_OBSERVER(InputDeviceEventObserver, observers_,
+                    OnMouseDeviceConfigurationChanged());
+}
+
+void DeviceDataManager::NotifyObserversTouchpadDeviceConfigurationChanged() {
+  FOR_EACH_OBSERVER(InputDeviceEventObserver, observers_,
+                    OnTouchpadDeviceConfigurationChanged());
+}
+
+void DeviceDataManager::NotifyObserversDeviceListsComplete() {
+    FOR_EACH_OBSERVER(InputDeviceEventObserver, observers_,
+                      OnDeviceListsComplete());
+}
+

[sadrul, 2015/07/10 17:35:48]

This can possibly be templatized. Not sure if that would cleaner.

[bruthig, 2015/07/10 20:04:58]

Done.

 void DeviceDataManager::AddObserver(InputDeviceEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceDataManager::RemoveObserver(InputDeviceEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ui