[Reland] Remove check for native events in SystemGestureEventFilter::OnMouseEvent()

ash/wm/system_gesture_event_filter.cc

Index: ash/wm/system_gesture_event_filter.cc
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index 44970b4049fc7ce38b93db0b3dc28f5f7759f4eb..f0bfb22ddc351762ffbf638c811cd13c5f241b4b 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -11,13 +11,10 @@
 #include "ash/wm/gestures/long_press_affordance_handler.h"
 #include "ash/wm/gestures/overview_gesture_handler.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
+#include "ui/base/touch/touch_device.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
-#if defined(OS_CHROMEOS) && defined(USE_X11)
-#include "ui/events/devices/x11/touch_factory_x11.h"
-#endif
-
 namespace ash {
 
 SystemGestureEventFilter::SystemGestureEventFilter()
@@ -30,10 +27,8 @@ SystemGestureEventFilter::~SystemGestureEventFilter() {
 }
 
 void SystemGestureEventFilter::OnMouseEvent(ui::MouseEvent* event) {
-#if defined(OS_CHROMEOS) && defined(USE_X11)
-  if (event->type() == ui::ET_MOUSE_PRESSED && event->HasNativeEvent() &&
-      ui::TouchFactory::GetInstance()->IsTouchDevicePresent() &&
-      Shell::GetInstance()->delegate()) {
+#if defined(OS_CHROMEOS)
+  if (event->type() == ui::ET_MOUSE_PRESSED && ui::IsTouchDevicePresent()) {
     Shell::GetInstance()->metrics()->RecordUserMetricsAction(UMA_MOUSE_DOWN);
   }
 #endif