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

ui/events/devices/device_data_manager.h

 // 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.
 
 #ifndef UI_EVENTS_DEVICES_DEVICE_DATA_MANAGER_H_
 #define UI_EVENTS_DEVICES_DEVICE_DATA_MANAGER_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/events/devices/device_hotplug_event_observer.h"
 #include "ui/events/devices/events_devices_export.h"
 #include "ui/events/devices/keyboard_device.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/gfx/transform.h"
 
 namespace ui {
 
+namespace test {
+class DeviceDataManagerTestAPI;
+}  // namespace test
+
 class InputDeviceEventObserver;
 
 // Keeps track of device mappings and event transformations.
 class EVENTS_DEVICES_EXPORT DeviceDataManager
     : public DeviceHotplugEventObserver {
  public:
   static const int kMaxDeviceNum = 128;
   ~DeviceDataManager() override;
 
   static void CreateInstance();
+  static void DeleteInstance();
   static DeviceDataManager* GetInstance();
   static bool HasInstance();
 
   void ClearTouchDeviceAssociations();
   void UpdateTouchInfoForDisplay(int64_t target_display_id,
                                  int touch_device_id,
                                  const gfx::Transform& touch_transformer);
   void ApplyTouchTransformer(int touch_device_id, float* x, float* y);
 
   // Gets the display that touches from |touch_device_id| should be sent to.
@@ skipping 13 matching lines @@
   bool device_lists_complete() const { return device_lists_complete_; }
 
   void AddObserver(InputDeviceEventObserver* observer);
   void RemoveObserver(InputDeviceEventObserver* observer);
 
  protected:
   DeviceDataManager();
 
   static DeviceDataManager* instance();
 
+  static void set_instance(DeviceDataManager* instance);
+
   // DeviceHotplugEventObserver:
   void OnTouchscreenDevicesUpdated(
       const std::vector<TouchscreenDevice>& devices) override;
   void OnKeyboardDevicesUpdated(
       const std::vector<KeyboardDevice>& devices) override;
   void OnMouseDevicesUpdated(
       const std::vector<InputDevice>& devices) override;
   void OnTouchpadDevicesUpdated(
       const std::vector<InputDevice>& devices) override;
   void OnDeviceListsComplete() override;
 
  private:
+  friend class test::DeviceDataManagerTestAPI;
+
   static DeviceDataManager* instance_;
 
   bool IsTouchDeviceIdValid(int touch_device_id) const;
 
+  void NotifyObserversTouchscreenDeviceConfigurationChanged();
+  void NotifyObserversKeyboardDeviceConfigurationChanged();
+  void NotifyObserversMouseDeviceConfigurationChanged();
+  void NotifyObserversTouchpadDeviceConfigurationChanged();
+  void NotifyObserversDeviceListsComplete();
+
   double touch_radius_scale_map_[kMaxDeviceNum];
 
   // Index table to find the target display id for a touch device.
   int64_t touch_device_to_target_display_map_[kMaxDeviceNum];
   // Index table to find the TouchTransformer for a touch device.
   gfx::Transform touch_device_transformer_map_[kMaxDeviceNum];
 
   std::vector<TouchscreenDevice> touchscreen_devices_;
   std::vector<KeyboardDevice> keyboard_devices_;
   std::vector<InputDevice> mouse_devices_;
   std::vector<InputDevice> touchpad_devices_;
   bool device_lists_complete_ = false;
 
   base::ObserverList<InputDeviceEventObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDataManager);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICES_DEVICE_DATA_MANAGER_H_