Make PointerDeviceObserver use ui::InputDeviceEventObserver on X11

chrome/browser/chromeos/system/pointer_device_observer.cc

Index: chrome/browser/chromeos/system/pointer_device_observer.cc
diff --git a/chrome/browser/chromeos/system/pointer_device_observer.cc b/chrome/browser/chromeos/system/pointer_device_observer.cc
index 2de130553decf29919085e13c07dce74fb9debe2..125e3afa572e7bf7e0257e4997940e1d8e68fb5c 100644
--- a/chrome/browser/chromeos/system/pointer_device_observer.cc
+++ b/chrome/browser/chromeos/system/pointer_device_observer.cc
@@ -11,10 +11,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "ui/events/devices/device_data_manager.h"
 
-#if defined(USE_X11)
-#include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"
-#endif
-
 using content::BrowserThread;
 
 namespace chromeos {
@@ -25,21 +21,11 @@ PointerDeviceObserver::PointerDeviceObserver()
 }
 
 PointerDeviceObserver::~PointerDeviceObserver() {
-#if defined(USE_X11)
-  XInputHierarchyChangedEventListener::GetInstance()
-      ->RemoveObserver(this);
-#elif defined(USE_OZONE)
   ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
-#endif
 }
 
 void PointerDeviceObserver::Init() {
-#if defined(USE_X11)
-  XInputHierarchyChangedEventListener::GetInstance()
-      ->AddObserver(this);
-#elif defined(USE_OZONE)
   ui::DeviceDataManager::GetInstance()->AddObserver(this);
-#endif
 }
 
 void PointerDeviceObserver::CheckDevices() {
@@ -55,10 +41,6 @@ void PointerDeviceObserver::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void PointerDeviceObserver::DeviceHierarchyChanged() {
-  CheckDevices();
-}
-
 void PointerDeviceObserver::OnMouseDeviceConfigurationChanged() {
   CheckDevices();
 }