UserGestureIndicator is a mess. Clean it up.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/input/TouchEventManager.h"
 
 #include "core/dom/Document.h"
 #include "core/events/TouchEvent.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/EventHandlerRegistry.h"
@@ skipping 506 matching lines @@
                                          ->securityContext()
                                          ->getSecurityOrigin();
     Frame* top = m_frame->tree().top();
     if (top &&
         securityOrigin->canAccess(top->securityContext()->getSecurityOrigin()))
       isSameOrigin = true;
   }
 
   std::unique_ptr<UserGestureIndicator> gestureIndicator;
   if (isTap || isSameOrigin) {
-    UserGestureUtilizedCallback* callback = 0;
+    gestureIndicator = wrapUnique(

[Rick Byers, 2016/10/11 19:28:12]

I think you can simplify this further now to eliminate the unique_ptr
indirection, right?  Something like:

if (isTap || isSameOrigin) {
  if (!m_touchSequenceUserGestureToken)
    m_touchSequenceUserGestureToken = UserGestureToken::create();
  // These are ...
  ...
}
// If we have a token, active it for the duration of dispatch
UserGestureIndicator holder(m_touchSequenceUserGestureToken)

+        new UserGestureIndicator(m_touchSequenceUserGestureToken
+                                     ? m_touchSequenceUserGestureToken.release()
+                                     : UserGestureToken::create()));
+
+    m_touchSequenceUserGestureToken = UserGestureIndicator::currentToken();
     // These are cases we'd like to migrate to not hold a user gesture.
     if (event.type() == PlatformEvent::TouchStart ||
         event.type() == PlatformEvent::TouchMove ||
         (event.type() == PlatformEvent::TouchEnd && m_touchScrollStarted)) {
       // Collect metrics in userGestureUtilized().
-      callback = this;
+      m_touchSequenceUserGestureToken->setUserGestureUtilizedCallback(this);
     }
-    if (m_touchSequenceUserGestureToken)
-      gestureIndicator = wrapUnique(new UserGestureIndicator(
-          m_touchSequenceUserGestureToken.release(), callback));
-    else
-      gestureIndicator = wrapUnique(
-          new UserGestureIndicator(DefinitelyProcessingUserGesture, callback));
-    m_touchSequenceUserGestureToken = UserGestureIndicator::currentToken();
   }
 
   return dispatchTouchEvents(event, touchInfos, allTouchesReleased);
 }
 
 bool TouchEventManager::isAnyTouchActive() const {
   return m_touchPressed;
 }
 
 void TouchEventManager::userGestureUtilized() {
@@ skipping 14 matching lines @@
       feature = UseCounter::TouchEndDuringScrollUserGestureUtilized;
       break;
     default:
       NOTREACHED();
       return;
   }
   Deprecation::countDeprecation(m_frame, feature);
 }
 
 }  // namespace blink