UserGestureIndicator is a mess. Clean it up.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 6658 matching lines @@
       toLocalFrame(webViewHelper.webView()->page()->mainFrame())->document();
   KURL destination = toKURL(m_baseURL + "hello_world.html");
 
   // ctrl+click event
   Event* event = MouseEvent::create(
       EventTypeNames::click, false, false, document->domWindow(), 0, 0, 0, 0, 0,
       0, 0, PlatformEvent::CtrlKey, 0, 0, nullptr, 0,
       PlatformMouseEvent::RealOrIndistinguishable, String(), nullptr);
   FrameLoadRequest frameRequest(document, ResourceRequest(destination));
   frameRequest.setTriggeringEvent(event);
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(UserGestureToken::create());
   toLocalFrame(webViewHelper.webView()->page()->mainFrame())
       ->loader()
       .load(frameRequest);
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(
       webViewHelper.webView()->mainFrame());
 
   // decidePolicyForNavigation should be called both for the original request
   // and the ctrl+click.
   EXPECT_EQ(2, webFrameClient.decidePolicyCallCount());
 }
@@ skipping 701 matching lines @@
   int viewportHeight = 480;
   client.m_screenInfo.rect.width = viewportWidth;
   client.m_screenInfo.rect.height = viewportHeight;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr,
       configureAndroid);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(UserGestureToken::create());
   Element* divFullscreen = document->getElementById("div1");
   Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(Fullscreen::currentFullScreenElementFrom(*document), divFullscreen);
 
   // Verify that the element is sized to the viewport.
   LayoutFullScreen* fullscreenLayoutObject =
       Fullscreen::from(*document).fullScreenLayoutObject();
   EXPECT_EQ(viewportWidth, fullscreenLayoutObject->logicalWidth().toInt());
@@ skipping 14 matching lines @@
   FrameTestHelpers::WebViewHelper webViewHelper;
   int viewportWidth = 640;
   int viewportHeight = 480;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr,
       configureAndroid);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(UserGestureToken::create());
   Element* divFullscreen = document->getElementById("div1");
   Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // Verify that the viewports are nonscrollable.
   EXPECT_EQ(Fullscreen::currentFullScreenElementFrom(*document), divFullscreen);
   FrameView* frameView = webViewHelper.webView()->mainFrameImpl()->frameView();
   WebLayer* layoutViewportScrollLayer =
       webViewImpl->compositor()->scrollLayer()->platformLayer();
@@ skipping 23 matching lines @@
   FrameTestHelpers::WebViewHelper webViewHelper;
   int viewportWidth = 640;
   int viewportHeight = 480;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr,
       configureAndroid);
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(UserGestureToken::create());
   Fullscreen::requestFullscreen(*document->documentElement(),
                                 Fullscreen::PrefixedRequest);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // Verify that the main frame is still scrollable.
   EXPECT_EQ(Fullscreen::currentFullScreenElementFrom(*document),
             document->documentElement());
   WebLayer* webScrollLayer =
       webViewImpl->compositor()->scrollLayer()->platformLayer();
@@ skipping 20 matching lines @@
   int viewportHeight = 480;
   client.m_screenInfo.rect.width = viewportWidth;
   client.m_screenInfo.rect.height = viewportHeight;
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   Document* document =
       toWebLocalFrameImpl(webViewHelper.webView()->mainFrame()->firstChild())
           ->frame()
           ->document();
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(UserGestureToken::create());
   Element* divFullscreen = document->getElementById("div1");
   Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // Verify that the element is sized to the viewport.
   LayoutFullScreen* fullscreenLayoutObject =
       Fullscreen::from(*document).fullScreenLayoutObject();
   EXPECT_EQ(viewportWidth, fullscreenLayoutObject->logicalWidth().toInt());
   EXPECT_EQ(viewportHeight, fullscreenLayoutObject->logicalHeight().toInt());
@@ skipping 23 matching lines @@
 
   LayoutViewItem layoutViewItem =
       webViewHelper.webView()->mainFrameImpl()->frameView()->layoutViewItem();
   EXPECT_EQ(320, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(533, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.2, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.2, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(5.0, webViewImpl->maximumPageScaleFactor());
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(UserGestureToken::create());
   Fullscreen::requestFullscreen(*document->documentElement(),
                                 Fullscreen::PrefixedRequest);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(384, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());
 
@@ skipping 16 matching lines @@
   int viewportWidth = 384;
   int viewportHeight = 640;
   client.m_screenInfo.rect.width = viewportWidth;
   client.m_screenInfo.rect.height = viewportHeight;
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   LayoutViewItem layoutViewItem =
       webViewHelper.webView()->mainFrameImpl()->frameView()->layoutViewItem();
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(UserGestureToken::create());
   Fullscreen::requestFullscreen(*document->documentElement(),
                                 Fullscreen::PrefixedRequest);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(384, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());
 
@@ skipping 41 matching lines @@
   EXPECT_EQ(screenSizeMinusStatusBarsMinusUrlBar.width,
             layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(screenSizeMinusStatusBarsMinusUrlBar.height,
             layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(5.0, webViewImpl->maximumPageScaleFactor());
 
   {
     Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-    UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+    UserGestureIndicator gesture(UserGestureToken::create());
     Fullscreen::requestFullscreen(*document->body(),
                                   Fullscreen::PrefixedRequest);
   }
 
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
   client.m_screenInfo.rect.width = screenSizeMinusStatusBars.width;
   client.m_screenInfo.rect.height = screenSizeMinusStatusBars.height;
   webViewHelper.resize(screenSizeMinusStatusBars);
   client.m_screenInfo.rect.width = screenSize.width;
@@ skipping 40 matching lines @@
   // viewport-tiny.html specifies a 320px layout width.
   LayoutViewItem layoutViewItem =
       webViewImpl->mainFrameImpl()->frameView()->layoutViewItem();
   EXPECT_EQ(320, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(0.3125, webViewImpl->pageScaleFactor());
   EXPECT_FLOAT_EQ(0.3125, webViewImpl->minimumPageScaleFactor());
   EXPECT_FLOAT_EQ(5.0, webViewImpl->maximumPageScaleFactor());
 
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
-  UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+  UserGestureIndicator gesture(
+      UserGestureToken::create(UserGestureToken::NewGesture));
   Fullscreen::requestFullscreen(*document->documentElement(),
                                 Fullscreen::PrefixedRequest);
   webViewImpl->didEnterFullscreen();
   webViewImpl->updateAllLifecyclePhases();
 
   // Entering fullscreen causes layout size and page scale limits to be
   // overridden.
   EXPECT_EQ(100, layoutViewItem.logicalWidth().floor());
   EXPECT_EQ(200, layoutViewItem.logicalHeight().floor());
   EXPECT_FLOAT_EQ(1.0, webViewImpl->pageScaleFactor());
@@ skipping 2427 matching lines @@
   Platform::current()->getURLLoaderMockFactory()->setLoaderDelegate(nullptr);
 
   Document* document =
       toLocalFrame(helper.webView()->page()->mainFrame())->document();
   EXPECT_TRUE(document->isImageDocument());
   EXPECT_EQ(Resource::DecodeError,
             toImageDocument(document)->cachedImage()->getStatus());
 }
 
 }  // namespace blink