UserGestureIndicator is a mess. Clean it up.

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 554 matching lines @@
     const PlatformMouseEvent& mouseEvent) {
   TRACE_EVENT0("blink", "EventHandler::handleMousePressEvent");
 
   // For 4th/5th button in the mouse since Chrome does not yet send
   // button value to Blink but in some cases it does send the event.
   // This check is needed to suppress such an event (crbug.com/574959)
   if (mouseEvent.pointerProperties().button ==
       WebPointerProperties::Button::NoButton)
     return WebInputEventResult::HandledSuppressed;
 
-  UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gestureIndicator(UserGestureToken::create());
   m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken =
       UserGestureIndicator::currentToken();
 
   if (m_eventHandlerWillResetCapturingMouseEventsNode)
     m_capturingMouseEventsNode = nullptr;
   m_mouseEventManager->handleMousePressEventUpdateStates(mouseEvent);
   selectionController().setMouseDownMayStartSelect(false);
   if (!m_frame->view())
     return WebInputEventResult::NotHandled;
 
@@ skipping 309 matching lines @@
   // This check is needed to suppress such an event (crbug.com/574959)
   if (mouseEvent.pointerProperties().button ==
       WebPointerProperties::Button::NoButton)
     return WebInputEventResult::HandledSuppressed;
 
   if (!mouseEvent.fromTouch())
     m_frame->selection().setCaretBlinkingSuspended(false);
 
   std::unique_ptr<UserGestureIndicator> gestureIndicator;
 
-  if (m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken)
+  if (m_frame->localFrameRoot()
+          ->eventHandler()
+          .m_lastMouseDownUserGestureToken) {
     gestureIndicator = wrapUnique(new UserGestureIndicator(
         m_frame->localFrameRoot()
             ->eventHandler()
             .m_lastMouseDownUserGestureToken.release()));
-  else
+  } else {
     gestureIndicator =
-        wrapUnique(new UserGestureIndicator(DefinitelyProcessingUserGesture));
+        wrapUnique(new UserGestureIndicator(UserGestureToken::create()));
+  }
 
   if (RuntimeEnabledFeatures::middleClickAutoscrollEnabled()) {
     if (Page* page = m_frame->page())
       page->autoscrollController().handleMouseReleaseForMiddleClickAutoscroll(
           m_frame, mouseEvent);
   }
 
   m_mouseEventManager->setMousePressed(false);
   m_mouseEventManager->setLastKnownMousePosition(mouseEvent);
   m_mouseEventManager->handleSvgPanIfNeeded(true);
@@ skipping 1128 matching lines @@
 }
 
 FrameHost* EventHandler::frameHost() const {
   if (!m_frame->page())
     return nullptr;
 
   return &m_frame->page()->frameHost();
 }
 
 }  // namespace blink