UserGestureIndicator is a mess. Clean it up.

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 333 matching lines @@
     AtomicString eventType;
     switch (inputEvent.type) {
       case WebInputEvent::MouseMove:
         eventType = EventTypeNames::mousemove;
         break;
       case WebInputEvent::MouseLeave:
         eventType = EventTypeNames::mouseout;
         break;
       case WebInputEvent::MouseDown:
         eventType = EventTypeNames::mousedown;
-        gestureIndicator = wrapUnique(
-            new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
+        gestureIndicator = wrapUnique(new UserGestureIndicator(
+            UserGestureToken::create(UserGestureToken::NewGesture)));
         m_mouseCaptureGestureToken = gestureIndicator->currentToken();
         break;
       case WebInputEvent::MouseUp:
         eventType = EventTypeNames::mouseup;
         gestureIndicator = wrapUnique(
             new UserGestureIndicator(m_mouseCaptureGestureToken.release()));
         break;
       default:
         NOTREACHED();
     }
@@ skipping 152 matching lines @@
   }
 
   // A keypress event is canceled. If an ongoing composition exists, then the
   // keydown event should have arisen from a handled key (e.g., backspace).
   // In this case we ignore the cancellation and continue; otherwise (no
   // ongoing composition) we exit and signal success only for attempts to
   // clear the composition.
   if (m_suppressNextKeypressEvent && !inputMethodController.hasComposition())
     return text.isEmpty();
 
-  UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+  UserGestureIndicator gestureIndicator(
+      UserGestureToken::create(UserGestureToken::NewGesture));
 
   // When the range of composition underlines overlap with the range between
   // selectionStart and selectionEnd, WebKit somehow won't paint the selection
   // at all (see InlineTextBox::paint() function in InlineTextBox.cpp).
   // But the selection range actually takes effect.
   inputMethodController.setComposition(
       String(text), CompositionUnderlineVectorBuilder(underlines),
       selectionStart, selectionEnd);
 
   return text.isEmpty() || inputMethodController.hasComposition();
 }
 
 // TODO(ekaramad):These methods are almost duplicated in WebViewImpl as well.
 // This code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::commitText(const WebString& text,
                                     int relativeCaretPosition) {
-  UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+  UserGestureIndicator gestureIndicator(
+      UserGestureToken::create(UserGestureToken::NewGesture));
   LocalFrame* focused = focusedLocalFrameAvailableForIme();
   if (!focused)
     return false;
 
   if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
     return plugin->commitText(text, relativeCaretPosition);
 
   return focused->inputMethodController().commitText(text,
                                                      relativeCaretPosition);
 }
@@ skipping 960 matching lines @@
   return flags;
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
   if (!m_imeAcceptEvents)
     return nullptr;
   return focusedLocalFrameInWidget();
 }
 
 }  // namespace blink