Fix software mirror mode on Ozone part 2/2

ui/events/devices/x11/device_data_manager_x11.cc

Index: ui/events/devices/x11/device_data_manager_x11.cc
diff --git a/ui/events/devices/x11/device_data_manager_x11.cc b/ui/events/devices/x11/device_data_manager_x11.cc
index 85c697aaa0d33376d8f60a81f768b4a11ad61acf..4bc304ce877b7c94f54fea43d2d2618f50d7f8da 100644
--- a/ui/events/devices/x11/device_data_manager_x11.cc
+++ b/ui/events/devices/x11/device_data_manager_x11.cc
@@ -668,11 +668,9 @@ void DeviceDataManagerX11::InitializeValuatorsForTest(int deviceid,
 bool DeviceDataManagerX11::TouchEventNeedsCalibrate(
     unsigned int touch_device_id) const {
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-  int64 touch_display_id = GetDisplayForTouchDevice(touch_device_id);
-  if (base::SysInfo::IsRunningOnChromeOS() &&
-      touch_display_id == gfx::Display::InternalDisplayId()) {
+  gfx::Display touch_display = GetDisplayForTouchDevice(touch_device_id);
+  if (base::SysInfo::IsRunningOnChromeOS() && touch_display.IsInternal())
     return true;
-  }
 #endif  // defined(OS_CHROMEOS) && defined(USE_X11)
   return false;
 }