Revert "MainFrame scrollbars should work with RFV instead of FV"

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

 // Copyright 2014 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/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
@@ skipping 90 matching lines @@
 
 namespace blink {
 ::std::ostream& operator<<(::std::ostream& os, const WebContextMenuData& data) {
   return os << "Context menu location: [" << data.mousePosition.x << ", "
             << data.mousePosition.y << "]";
 }
 }
 
 namespace {
 
-class VisualViewportTest : public testing::Test {
+typedef bool TestParamRootLayerScrolling;
+class VisualViewportTest
+    : public testing::Test,
+      public testing::WithParamInterface<TestParamRootLayerScrolling>,
+      private ScopedRootLayerScrollingForTest {
  public:
-  VisualViewportTest() : m_baseURL("http://www.test.com/") {}
+  VisualViewportTest()
+      : ScopedRootLayerScrollingForTest(GetParam()),
+        m_baseURL("http://www.test.com/") {}
 
   void initializeWithDesktopSettings(
       void (*overrideSettingsFunc)(WebSettings*) = 0) {
     if (!overrideSettingsFunc)
       overrideSettingsFunc = &configureSettings;
     m_helper.initialize(true, nullptr, &m_mockWebViewClient, nullptr,
                         overrideSettingsFunc);
     webViewImpl()->setDefaultPageScaleLimits(1, 4);
   }
 
@@ skipping 54 matching lines @@
   }
 
  protected:
   std::string m_baseURL;
   FrameTestHelpers::TestWebViewClient m_mockWebViewClient;
 
  private:
   FrameTestHelpers::WebViewHelper m_helper;
 };
 
-typedef bool TestParamRootLayerScrolling;
-class ParameterizedVisualViewportTest
-    : public testing::WithParamInterface<TestParamRootLayerScrolling>,
-      private ScopedRootLayerScrollingForTest,
-      public VisualViewportTest {
- public:
-  ParameterizedVisualViewportTest()
-      : ScopedRootLayerScrollingForTest(GetParam()) {}
-};
-
-INSTANTIATE_TEST_CASE_P(All,
-                        ParameterizedVisualViewportTest,
-                        ::testing::Bool());
+INSTANTIATE_TEST_CASE_P(All, VisualViewportTest, ::testing::Bool());
 
 // Test that resizing the VisualViewport works as expected and that resizing the
 // WebView resizes the VisualViewport.
-TEST_P(ParameterizedVisualViewportTest, TestResize) {
+TEST_P(VisualViewportTest, TestResize) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
 
   IntSize webViewSize = webViewImpl()->size();
 
   // Make sure the visual viewport was initialized.
   EXPECT_SIZE_EQ(webViewSize, visualViewport.size());
 
   // Resizing the WebView should change the VisualViewport.
   webViewSize = IntSize(640, 480);
   webViewImpl()->resize(webViewSize);
   EXPECT_SIZE_EQ(webViewSize, IntSize(webViewImpl()->size()));
   EXPECT_SIZE_EQ(webViewSize, visualViewport.size());
 
   // Resizing the visual viewport shouldn't affect the WebView.
   IntSize newViewportSize = IntSize(320, 200);
   visualViewport.setSize(newViewportSize);
   EXPECT_SIZE_EQ(webViewSize, IntSize(webViewImpl()->size()));
   EXPECT_SIZE_EQ(newViewportSize, visualViewport.size());
 }
 
 // Make sure that the visibleContentRect method acurately reflects the scale and
 // scroll location of the viewport with and without scrollbars.
-TEST_P(ParameterizedVisualViewportTest, TestVisibleContentRect) {
+TEST_P(VisualViewportTest, TestVisibleContentRect) {
   RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
   initializeWithDesktopSettings();
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   IntSize size = IntSize(150, 100);
   // Vertical scrollbar width and horizontal scrollbar height.
   IntSize scrollbarSize = IntSize(15, 15);
 
@@ skipping 19 matching lines @@
             visualViewport.visibleContentRect(ExcludeScrollbars));
   EXPECT_EQ(IntRect(IntPoint(10, 10), size),
             visualViewport.visibleContentRect(IncludeScrollbars));
 }
 
 // This tests that shrinking the WebView while the page is fully scrolled
 // doesn't move the viewport up/left, it should keep the visible viewport
 // unchanged from the user's perspective (shrinking the FrameView will clamp
 // the VisualViewport so we need to counter scroll the FrameView to make it
 // appear to stay still). This caused bugs like crbug.com/453859.
-TEST_P(ParameterizedVisualViewportTest,
-       TestResizeAtFullyScrolledPreservesViewportLocation) {
+TEST_P(VisualViewportTest, TestResizeAtFullyScrolledPreservesViewportLocation) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(800, 600));
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
 
@@ skipping 21 matching lines @@
       expectedLocation,
       frameView.getScrollableArea()->visibleContentRect().location());
 
   webViewImpl()->resize(IntSize(800, 600));
 
   EXPECT_POINT_EQ(
       expectedLocation,
       frameView.getScrollableArea()->visibleContentRect().location());
 }
 
-// Test the main frame scrollbars take visual viewport into account.
-TEST_F(VisualViewportTest, VerifyScrollbarBehavior) {
-  initializeWithDesktopSettings();
-
-  registerMockedHttpURLLoad("200-by-800-viewport.html");
-  navigateTo(m_baseURL + "200-by-800-viewport.html");
-
-  webViewImpl()->resize(IntSize(300, 200));
-
-  ScrollableArea* scroller = frame()->view()->getScrollableArea();
-
-  // Initially, there is no horizontal scrollbar since the content fits.
-  EXPECT_FALSE(scroller->horizontalScrollbar());
-  EXPECT_TRUE(scroller->verticalScrollbar());
-
-  // Scroll layout viewport.
-  webViewImpl()->mainFrame()->setScrollOffset(WebSize(0, 200));
-  EXPECT_SIZE_EQ(ScrollOffset(0, 200), scroller->scrollOffset());
-
-  webViewImpl()->setPageScaleFactor(2.0);
-
-  // Pinch-zooming should add horizontal scrollbar.
-  EXPECT_TRUE(scroller->horizontalScrollbar());
-  EXPECT_TRUE(scroller->verticalScrollbar());
-
-  // Scroll visual viewport.
-  VisualViewport& visualViewport =
-      frame()->page()->frameHost().visualViewport();
-  visualViewport.setLocation(FloatPoint(100, 100));
-  EXPECT_FLOAT_SIZE_EQ(FloatSize(100, 100), visualViewport.scrollOffset());
-
-  // Scrollbar offset should take visual viewport into account.
-  EXPECT_FLOAT_EQ(100, scroller->horizontalScrollbar()->currentPos());
-  EXPECT_FLOAT_EQ(300, scroller->verticalScrollbar()->currentPos());
-}
-
 // Test that the VisualViewport works as expected in case of a scaled
 // and scrolled viewport - scroll down.
-TEST_P(ParameterizedVisualViewportTest, TestResizeAfterVerticalScroll) {
+TEST_P(VisualViewportTest, TestResizeAfterVerticalScroll) {
 /*
                  200                                 200
         |                   |               |                   |
         |                   |               |                   |
         |                   | 800           |                   | 800
         |-------------------|               |                   |
         |                   |               |                   |
         |                   |               |                   |
         |                   |               |                   |
         |                   |   -------->   |                   |
@@ skipping 49 matching lines @@
   EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 25), visualViewport.visibleRect().size());
 
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 625),
       frame()->view()->layoutViewportScrollableArea()->scrollOffset());
   EXPECT_FLOAT_SIZE_EQ(FloatSize(0, 75), visualViewport.scrollOffset());
 }
 
 // Test that the VisualViewport works as expected in case if a scaled
 // and scrolled viewport - scroll right.
-TEST_P(ParameterizedVisualViewportTest, TestResizeAfterHorizontalScroll) {
+TEST_P(VisualViewportTest, TestResizeAfterHorizontalScroll) {
 /*
                  200                                 200
         ---------------o-----               ---------------o-----
         |              |    |               |            25|    |
         |              |    |               |              -----|
         |           100|    |               |100             50 |
         |              |    |               |                   |
         |              ---- |               |-------------------|
         |                   |               |                   |
         |                   |               |                   |
@@ skipping 44 matching lines @@
 
   // After resizing the scale changes 2.0 -> 4.0
   EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 25), visualViewport.visibleRect().size());
 
   EXPECT_SIZE_EQ(ScrollOffset(0, 0), frame()->view()->scrollOffset());
   EXPECT_FLOAT_SIZE_EQ(FloatSize(150, 0), visualViewport.scrollOffset());
 }
 
 // Test that the container layer gets sized properly if the WebView is resized
 // prior to the VisualViewport being attached to the layer tree.
-TEST_P(ParameterizedVisualViewportTest, TestWebViewResizedBeforeAttachment) {
+TEST_P(VisualViewportTest, TestWebViewResizedBeforeAttachment) {
   initializeWithDesktopSettings();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   GraphicsLayer* rootGraphicsLayer =
       frameView.layoutViewItem().compositor()->rootGraphicsLayer();
 
   // Make sure that a resize that comes in while there's no root layer is
   // honoured when we attach to the layer tree.
   WebFrameWidgetBase* mainFrameWidget =
       webViewImpl()->mainFrameImpl()->frameWidget();
   mainFrameWidget->setRootGraphicsLayer(nullptr);
   webViewImpl()->resize(IntSize(320, 240));
   mainFrameWidget->setRootGraphicsLayer(rootGraphicsLayer);
 
   navigateTo("about:blank");
   webViewImpl()->updateAllLifecyclePhases();
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   EXPECT_FLOAT_SIZE_EQ(FloatSize(320, 240),
                        visualViewport.containerLayer()->size());
 }
 
 // Make sure that the visibleRect method acurately reflects the scale and scroll
 // location of the viewport.
-TEST_P(ParameterizedVisualViewportTest, TestVisibleRect) {
+TEST_P(VisualViewportTest, TestVisibleRect) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
 
   // Initial visible rect should be the whole frame.
@@ skipping 30 matching lines @@
   visualViewport.setScale(3);
   EXPECT_FLOAT_RECT_EQ(expectedRect, visualViewport.visibleRect());
 
   expectedRect.setLocation(FloatPoint(0.25f, 0.333f));
   visualViewport.setLocation(expectedRect.location());
   EXPECT_FLOAT_RECT_EQ(expectedRect, visualViewport.visibleRect());
 }
 
 // Make sure that the visibleRectInDocument method acurately reflects the scale
 // and scroll location of the viewport relative to the document.
-TEST_P(ParameterizedVisualViewportTest, TestVisibleRectInDocument) {
+TEST_P(VisualViewportTest, TestVisibleRectInDocument) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(100, 400));
 
   registerMockedHttpURLLoad("200-by-800-viewport.html");
   navigateTo(m_baseURL + "200-by-800-viewport.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
 
   // Scale the viewport to 2X and move it.
   visualViewport.setScale(2);
   visualViewport.setLocation(FloatPoint(10, 15));
   EXPECT_FLOAT_RECT_EQ(FloatRect(10, 15, 50, 200),
                        visualViewport.visibleRectInDocument());
 
   // Scroll the layout viewport. Ensure its offset is reflected in
   // visibleRectInDocument().
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   frameView.layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(40, 100), ProgrammaticScroll);
   EXPECT_FLOAT_RECT_EQ(FloatRect(50, 115, 50, 200),
                        visualViewport.visibleRectInDocument());
 }
 
-TEST_P(ParameterizedVisualViewportTest,
-       TestFractionalScrollOffsetIsNotOverwritten) {
+TEST_P(VisualViewportTest, TestFractionalScrollOffsetIsNotOverwritten) {
   bool origFractionalOffsetsEnabled =
       RuntimeEnabledFeatures::fractionalScrollOffsetsEnabled();
   RuntimeEnabledFeatures::setFractionalScrollOffsetsEnabled(true);
 
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(200, 250));
 
   registerMockedHttpURLLoad("200-by-800-viewport.html");
   navigateTo(m_baseURL + "200-by-800-viewport.html");
 
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   frameView.layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(0, 10.5), ProgrammaticScroll);
   frameView.layoutViewportScrollableArea()->ScrollableArea::setScrollOffset(
       ScrollOffset(10, 30.5), CompositorScroll);
 
   EXPECT_EQ(30.5,
             frameView.layoutViewportScrollableArea()->scrollOffset().height());
 
   RuntimeEnabledFeatures::setFractionalScrollOffsetsEnabled(
       origFractionalOffsetsEnabled);
 }
 
 // Test that the viewport's scroll offset is always appropriately bounded such
 // that the visual viewport always stays within the bounds of the main frame.
-TEST_P(ParameterizedVisualViewportTest, TestOffsetClamping) {
+TEST_P(VisualViewportTest, TestOffsetClamping) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   // Visual viewport should be initialized to same size as frame so no scrolling
   // possible.
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
@@ skipping 35 matching lines @@
 
   // Scale out smaller than 1.
   visualViewport.setScale(0.25);
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
 }
 
 // Test that the viewport can be scrolled around only within the main frame in
 // the presence of viewport resizes, as would be the case if the on screen
 // keyboard came up.
-TEST_P(ParameterizedVisualViewportTest, TestOffsetClampingWithResize) {
+TEST_P(VisualViewportTest, TestOffsetClampingWithResize) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   // Visual viewport should be initialized to same size as frame so no scrolling
   // possible.
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
@@ skipping 48 matching lines @@
   visualViewport.setLocation(FloatPoint(10, 3));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(10, 3),
                         visualViewport.visibleRect().location());
   visualViewport.setLocation(FloatPoint(-10, -4));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
                         visualViewport.visibleRect().location());
 }
 
 // Test that the viewport is scrollable but bounded appropriately within the
 // main frame when we apply both scaling and resizes.
-TEST_P(ParameterizedVisualViewportTest, TestOffsetClampingWithResizeAndScale) {
+TEST_P(VisualViewportTest, TestOffsetClampingWithResizeAndScale) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   navigateTo("about:blank");
   forceFullCompositingUpdate();
 
   // Visual viewport should be initialized to same size as WebView so no
   // scrolling possible.
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
@@ skipping 34 matching lines @@
   visualViewport.setLocation(FloatPoint(200, 200));
   visualViewport.setSize(IntSize(880, 560));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(200, 200),
                         visualViewport.visibleRect().location());
 }
 
 // The main FrameView's size should be set such that its the size of the visual
 // viewport at minimum scale. If there's no explicit minimum scale set, the
 // FrameView should be set to the content width and height derived by the aspect
 // ratio.
-TEST_P(ParameterizedVisualViewportTest, TestFrameViewSizedToContent) {
+TEST_P(VisualViewportTest, TestFrameViewSizedToContent) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   registerMockedHttpURLLoad("200-by-300-viewport.html");
   navigateTo(m_baseURL + "200-by-300-viewport.html");
 
   webViewImpl()->resize(IntSize(600, 800));
   webViewImpl()->updateAllLifecyclePhases();
 
   // Note: the size is ceiled and should match the behavior in CC's
   // LayerImpl::bounds().
   EXPECT_SIZE_EQ(
       IntSize(200, 267),
       webViewImpl()->mainFrameImpl()->frameView()->frameRect().size());
 }
 
 // The main FrameView's size should be set such that its the size of the visual
 // viewport at minimum scale. On Desktop, the minimum scale is set at 1 so make
 // sure the FrameView is sized to the viewport.
-TEST_P(ParameterizedVisualViewportTest, TestFrameViewSizedToMinimumScale) {
+TEST_P(VisualViewportTest, TestFrameViewSizedToMinimumScale) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   webViewImpl()->resize(IntSize(100, 160));
   webViewImpl()->updateAllLifecyclePhases();
 
   EXPECT_SIZE_EQ(
       IntSize(100, 160),
       webViewImpl()->mainFrameImpl()->frameView()->frameRect().size());
 }
 
 // Test that attaching a new frame view resets the size of the inner viewport
 // scroll layer. crbug.com/423189.
-TEST_P(ParameterizedVisualViewportTest,
-       TestAttachingNewFrameSetsInnerScrollLayerSize) {
+TEST_P(VisualViewportTest, TestAttachingNewFrameSetsInnerScrollLayerSize) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   // Load a wider page first, the navigation should resize the scroll layer to
   // the smaller size on the second navigation.
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
   webViewImpl()->updateAllLifecyclePhases();
 
   VisualViewport& visualViewport =
@@ skipping 16 matching lines @@
             visualViewport.scrollLayer()->elementId().secondaryId);
 
   // Ensure the location and scale were reset.
   EXPECT_SIZE_EQ(FloatSize(), visualViewport.scrollOffset());
   EXPECT_EQ(1, visualViewport.scale());
 }
 
 // The main FrameView's size should be set such that its the size of the visual
 // viewport at minimum scale. Test that the FrameView is appropriately sized in
 // the presence of a viewport <meta> tag.
-TEST_P(ParameterizedVisualViewportTest,
-       TestFrameViewSizedToViewportMetaMinimumScale) {
+TEST_P(VisualViewportTest, TestFrameViewSizedToViewportMetaMinimumScale) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(320, 240));
 
   registerMockedHttpURLLoad("200-by-300-min-scale-2.html");
   navigateTo(m_baseURL + "200-by-300-min-scale-2.html");
 
   webViewImpl()->resize(IntSize(100, 160));
   webViewImpl()->updateAllLifecyclePhases();
 
   EXPECT_SIZE_EQ(
       IntSize(50, 80),
       webViewImpl()->mainFrameImpl()->frameView()->frameRect().size());
 }
 
 // Test that the visual viewport still gets sized in AutoSize/AutoResize mode.
-TEST_P(ParameterizedVisualViewportTest,
-       TestVisualViewportGetsSizeInAutoSizeMode) {
+TEST_P(VisualViewportTest, TestVisualViewportGetsSizeInAutoSizeMode) {
   initializeWithDesktopSettings();
 
   EXPECT_SIZE_EQ(IntSize(0, 0), IntSize(webViewImpl()->size()));
   EXPECT_SIZE_EQ(IntSize(0, 0),
                  frame()->page()->frameHost().visualViewport().size());
 
   webViewImpl()->enableAutoResizeMode(WebSize(10, 10), WebSize(1000, 1000));
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   EXPECT_SIZE_EQ(IntSize(200, 300),
                  frame()->page()->frameHost().visualViewport().size());
 }
 
 // Test that the text selection handle's position accounts for the visual
 // viewport.
-TEST_P(ParameterizedVisualViewportTest, TestTextSelectionHandles) {
+TEST_P(VisualViewportTest, TestTextSelectionHandles) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(500, 800));
 
   registerMockedHttpURLLoad("pinch-viewport-input-field.html");
   navigateTo(m_baseURL + "pinch-viewport-input-field.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   webViewImpl()->setInitialFocus(false);
 
@@ skipping 14 matching lines @@
 
   EXPECT_POINT_EQ(expected, IntRect(anchor).location());
   EXPECT_POINT_EQ(expected, IntRect(focus).location());
 
   // FIXME(bokan) - http://crbug.com/364154 - Figure out how to test text
   // selection as well rather than just carret.
 }
 
 // Test that the HistoryItem for the page stores the visual viewport's offset
 // and scale.
-TEST_P(ParameterizedVisualViewportTest, TestSavedToHistoryItem) {
+TEST_P(VisualViewportTest, TestSavedToHistoryItem) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(200, 300));
   webViewImpl()->updateAllLifecyclePhases();
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   EXPECT_SIZE_EQ(ScrollOffset(0, 0),
                  toLocalFrame(webViewImpl()->page()->mainFrame())
                      ->loader()
@@ skipping 12 matching lines @@
   visualViewport.setLocation(FloatPoint(10, 20));
 
   EXPECT_SIZE_EQ(ScrollOffset(10, 20),
                  toLocalFrame(webViewImpl()->page()->mainFrame())
                      ->loader()
                      .currentItem()
                      ->visualViewportScrollOffset());
 }
 
 // Test restoring a HistoryItem properly restores the visual viewport's state.
-TEST_P(ParameterizedVisualViewportTest, TestRestoredFromHistoryItem) {
+TEST_P(VisualViewportTest, TestRestoredFromHistoryItem) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(200, 300));
 
   registerMockedHttpURLLoad("200-by-300.html");
 
   WebHistoryItem item;
   item.initialize();
   WebURL destinationURL(URLTestHelpers::toKURL(m_baseURL + "200-by-300.html"));
   item.setURLString(destinationURL.string());
   item.setVisualViewportScrollOffset(WebFloatPoint(100, 120));
   item.setPageScaleFactor(2);
 
   FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item,
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::UseProtocolCachePolicy);
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   EXPECT_EQ(2, visualViewport.scale());
 
   EXPECT_FLOAT_POINT_EQ(FloatPoint(100, 120),
                         visualViewport.visibleRect().location());
 }
 
 // Test restoring a HistoryItem without the visual viewport offset falls back to
 // distributing the scroll offset between the main frame and the visual
 // viewport.
-TEST_P(ParameterizedVisualViewportTest, TestRestoredFromLegacyHistoryItem) {
+TEST_P(VisualViewportTest, TestRestoredFromLegacyHistoryItem) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(100, 150));
 
   registerMockedHttpURLLoad("200-by-300-viewport.html");
 
   WebHistoryItem item;
   item.initialize();
   WebURL destinationURL(
       URLTestHelpers::toKURL(m_baseURL + "200-by-300-viewport.html"));
   item.setURLString(destinationURL.string());
@@ skipping 12 matching lines @@
   EXPECT_EQ(2, visualViewport.scale());
   EXPECT_SIZE_EQ(
       ScrollOffset(100, 150),
       frame()->view()->layoutViewportScrollableArea()->scrollOffset());
   EXPECT_FLOAT_POINT_EQ(FloatPoint(20, 30),
                         visualViewport.visibleRect().location());
 }
 
 // Test that navigation to a new page with a different sized main frame doesn't
 // clobber the history item's main frame scroll offset. crbug.com/371867
-TEST_P(ParameterizedVisualViewportTest,
+TEST_P(VisualViewportTest,
        TestNavigateToSmallerFrameViewHistoryItemClobberBug) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(400, 400));
   webViewImpl()->updateAllLifecyclePhases();
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   FrameView* frameView = webViewImpl()->mainFrameImpl()->frameView();
   frameView->layoutViewportScrollableArea()->setScrollOffset(
@@ skipping 17 matching lines @@
   frameView = webViewImpl()->mainFrameImpl()->frameView();
 
   EXPECT_NE(firstItem,
             webViewImpl()->mainFrameImpl()->frame()->loader().currentItem());
   EXPECT_LT(frameView->frameRect().size().width(), 1000);
   EXPECT_SIZE_EQ(ScrollOffset(0, 1000), firstItem->scrollOffset());
 }
 
 // Test that the coordinates sent into moveRangeSelection are offset by the
 // visual viewport's location.
-TEST_P(ParameterizedVisualViewportTest,
+TEST_P(VisualViewportTest,
        DISABLED_TestWebFrameRangeAccountsForVisualViewportScroll) {
   initializeWithDesktopSettings();
   webViewImpl()->settings()->setDefaultFontSize(12);
   webViewImpl()->resize(WebSize(640, 480));
   registerMockedHttpURLLoad("move_range.html");
   navigateTo(m_baseURL + "move_range.html");
 
   WebRect baseRect;
   WebRect extentRect;
 
@@ skipping 15 matching lines @@
   // right and down one line.
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   visualViewport.move(ScrollOffset(60, 25));
   mainFrame->toWebLocalFrame()->moveRangeSelection(initialPoint, endPoint);
   EXPECT_EQ("t ", mainFrame->toWebLocalFrame()->selectionAsText().utf8());
 }
 
 // Test that the scrollFocusedEditableElementIntoRect method works with the
 // visual viewport.
-TEST_P(ParameterizedVisualViewportTest,
-       DISABLED_TestScrollFocusedEditableElementIntoRect) {
+TEST_P(VisualViewportTest, DISABLED_TestScrollFocusedEditableElementIntoRect) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(500, 300));
 
   registerMockedHttpURLLoad("pinch-viewport-input-field.html");
   navigateTo(m_baseURL + "pinch-viewport-input-field.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   webViewImpl()->resizeVisualViewport(IntSize(200, 100));
   webViewImpl()->setInitialFocus(false);
@@ skipping 32 matching lines @@
   webViewImpl()->setPageScaleFactor(2);
   webViewImpl()->scrollFocusedEditableElementIntoRect(IntRect(0, 0, 500, 200));
   EXPECT_SIZE_EQ(ScrollOffset(200 - 30 - 75, 600 - 50 - 65),
                  frame()->view()->scrollOffset());
   EXPECT_FLOAT_POINT_EQ(FloatPoint(30, 50),
                         visualViewport.visibleRect().location());
 }
 
 // Test that resizing the WebView causes ViewportConstrained objects to
 // relayout.
-TEST_P(ParameterizedVisualViewportTest,
-       TestWebViewResizeCausesViewportConstrainedLayout) {
+TEST_P(VisualViewportTest, TestWebViewResizeCausesViewportConstrainedLayout) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(500, 300));
 
   registerMockedHttpURLLoad("pinch-viewport-fixed-pos.html");
   navigateTo(m_baseURL + "pinch-viewport-fixed-pos.html");
 
   LayoutObject* navbar =
       frame()->document()->getElementById("navbar")->layoutObject();
 
   EXPECT_FALSE(navbar->needsLayout());
@@ skipping 15 matching lines @@
            std::string(negation ? "is" : "isn't") + " at expected location [" +
                PrintToString(x) +
                ", " +
                PrintToString(y) +
                "]") {
   return arg.mousePosition.x == x && arg.mousePosition.y == y;
 }
 
 // Test that the context menu's location is correct in the presence of visual
 // viewport offset.
-TEST_P(ParameterizedVisualViewportTest, TestContextMenuShownInCorrectLocation) {
+TEST_P(VisualViewportTest, TestContextMenuShownInCorrectLocation) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(200, 300));
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   WebMouseEvent mouseDownEvent;
   mouseDownEvent.type = WebInputEvent::MouseDown;
   mouseDownEvent.x = 10;
   mouseDownEvent.y = 10;
@@ skipping 34 matching lines @@
 
   mouseDownEvent.button = WebMouseEvent::Button::Right;
   webViewImpl()->handleInputEvent(mouseDownEvent);
   webViewImpl()->handleInputEvent(mouseUpEvent);
 
   // Reset the old client so destruction can occur naturally.
   webViewImpl()->mainFrameImpl()->setClient(oldClient);
 }
 
 // Test that the client is notified if page scroll events.
-TEST_P(ParameterizedVisualViewportTest, TestClientNotifiedOfScrollEvents) {
+TEST_P(VisualViewportTest, TestClientNotifiedOfScrollEvents) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(200, 300));
 
   registerMockedHttpURLLoad("200-by-300.html");
   navigateTo(m_baseURL + "200-by-300.html");
 
   WebFrameClient* oldClient = webViewImpl()->mainFrameImpl()->client();
   MockWebFrameClient mockWebFrameClient;
   webViewImpl()->mainFrameImpl()->setClient(&mockWebFrameClient);
 
@@ skipping 13 matching lines @@
   // Scroll horizontally.
   EXPECT_CALL(mockWebFrameClient, didChangeScrollOffset(_));
   visualViewport.setLocation(FloatPoint(70, 90));
 
   // Reset the old client so destruction can occur naturally.
   webViewImpl()->mainFrameImpl()->setClient(oldClient);
 }
 
 // Tests that calling scroll into view on a visible element doesn't cause
 // a scroll due to a fractional offset. Bug crbug.com/463356.
-TEST_P(ParameterizedVisualViewportTest, ScrollIntoViewFractionalOffset) {
+TEST_P(VisualViewportTest, ScrollIntoViewFractionalOffset) {
   initializeWithAndroidSettings();
 
   webViewImpl()->resize(IntSize(1000, 1000));
 
   registerMockedHttpURLLoad("scroll-into-view.html");
   navigateTo(m_baseURL + "scroll-into-view.html");
 
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   ScrollableArea* layoutViewportScrollableArea =
       frameView.layoutViewportScrollableArea();
@@ skipping 57 matching lines @@
     VisualViewport& visualViewport,
     FrameView& frameView) {
   float aspectRatio = visualViewport.visibleRect().width() /
                       visualViewport.visibleRect().height();
   float newHeight = frameView.frameRect().width() / aspectRatio;
   return ScrollOffset(
       frameView.contentsSize().width() - frameView.frameRect().width(),
       frameView.contentsSize().height() - newHeight);
 }
 
-TEST_P(ParameterizedVisualViewportTest, TestBrowserControlsAdjustment) {
+TEST_P(VisualViewportTest, TestBrowserControlsAdjustment) {
   initializeWithAndroidSettings();
   webViewImpl()->resizeWithBrowserControls(IntSize(500, 450), 20, false);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
@@ skipping 30 matching lines @@
   EXPECT_FLOAT_SIZE_EQ(FloatSize(500, 881 - 441),
                        visualViewport.scrollOffset());
 
   // The outer viewport (FrameView) should be affected as well.
   frameView.layoutViewportScrollableArea()->scrollBy(ScrollOffset(10000, 10000),
                                                      UserScroll);
   EXPECT_SIZE_EQ(expectedMaxFrameViewScrollOffset(visualViewport, frameView),
                  frameView.layoutViewportScrollableArea()->scrollOffset());
 }
 
-TEST_P(ParameterizedVisualViewportTest,
-       TestBrowserControlsAdjustmentWithScale) {
+TEST_P(VisualViewportTest, TestBrowserControlsAdjustmentWithScale) {
   initializeWithAndroidSettings();
   webViewImpl()->resizeWithBrowserControls(IntSize(500, 450), 20, false);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
@@ skipping 53 matching lines @@
 
   frameView.layoutViewportScrollableArea()->scrollBy(ScrollOffset(10000, 10000),
                                                      UserScroll);
   EXPECT_SIZE_EQ(expectedMaxFrameViewScrollOffset(visualViewport, frameView),
                  frameView.layoutViewportScrollableArea()->scrollOffset());
 }
 
 // Tests that a scroll all the way to the bottom of the page, while hiding the
 // browser controls doesn't cause a clamp in the viewport scroll offset when the
 // top controls initiated resize occurs.
-TEST_P(ParameterizedVisualViewportTest,
-       TestBrowserControlsAdjustmentAndResize) {
+TEST_P(VisualViewportTest, TestBrowserControlsAdjustmentAndResize) {
   int browserControlsHeight = 20;
   int visualViewportHeight = 450;
   int layoutViewportHeight = 900;
   float pageScale = 2;
   float minPageScale = 0.5;
 
   initializeWithAndroidSettings();
 
   // Initialize with browser controls showing and shrinking the Blink size.
   webViewImpl()->resizeWithBrowserControls(
@@ skipping 50 matching lines @@
   EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight),
                  frameView.frameRect().size());
   EXPECT_SIZE_EQ(totalExpected,
                  visualViewport.scrollOffset() +
                      frameView.layoutViewportScrollableArea()->scrollOffset());
 }
 
 // Tests that a scroll all the way to the bottom while showing the browser
 // controls doesn't cause a clamp to the viewport scroll offset when the browser
 // controls initiated resize occurs.
-TEST_P(ParameterizedVisualViewportTest,
-       TestBrowserControlsShrinkAdjustmentAndResize) {
+TEST_P(VisualViewportTest, TestBrowserControlsShrinkAdjustmentAndResize) {
   int browserControlsHeight = 20;
   int visualViewportHeight = 500;
   int layoutViewportHeight = 1000;
   int contentHeight = 2000;
   float pageScale = 2;
   float minPageScale = 0.5;
 
   initializeWithAndroidSettings();
 
   // Initialize with browser controls hidden and not shrinking the Blink size.
@@ skipping 54 matching lines @@
   EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight -
                                    browserControlsHeight / minPageScale),
                  frameView.frameRect().size());
   EXPECT_SIZE_EQ(totalExpected,
                  visualViewport.scrollOffset() +
                      frameView.layoutViewportScrollableArea()->scrollOffset());
 }
 
 // Tests that a resize due to browser controls hiding doesn't incorrectly clamp
 // the main frame's scroll offset. crbug.com/428193.
-TEST_P(ParameterizedVisualViewportTest,
-       TestTopControlHidingResizeDoesntClampMainFrame) {
+TEST_P(VisualViewportTest, TestTopControlHidingResizeDoesntClampMainFrame) {
   initializeWithAndroidSettings();
   webViewImpl()->resizeWithBrowserControls(webViewImpl()->size(), 500, false);
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, 1);
   webViewImpl()->resizeWithBrowserControls(WebSize(1000, 1000), 500, true);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   // Scroll the FrameView to the bottom of the page but "hide" the browser
@@ skipping 13 matching lines @@
             frameView.layoutViewportScrollableArea()->scrollOffset().height());
 }
 
 static void configureHiddenScrollbarsSettings(WebSettings* settings) {
   VisualViewportTest::configureAndroidSettings(settings);
   settings->setHideScrollbars(true);
 }
 
 // Tests that scrollbar layers are not attached to the inner viewport container
 // layer when hideScrollbars WebSetting is true.
-TEST_P(ParameterizedVisualViewportTest,
+TEST_P(VisualViewportTest,
        TestScrollbarsNotAttachedWhenHideScrollbarsSettingIsTrue) {
   initializeWithAndroidSettings(configureHiddenScrollbarsSettings);
   webViewImpl()->resize(IntSize(100, 150));
   navigateTo("about:blank");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   EXPECT_FALSE(visualViewport.layerForHorizontalScrollbar()->parent());
   EXPECT_FALSE(visualViewport.layerForVerticalScrollbar()->parent());
 }
 
 // Tests that scrollbar layers are attached to the inner viewport container
 // layer when hideScrollbars WebSetting is false.
-TEST_P(ParameterizedVisualViewportTest,
+TEST_P(VisualViewportTest,
        TestScrollbarsAttachedWhenHideScrollbarsSettingIsFalse) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(100, 150));
   navigateTo("about:blank");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   EXPECT_TRUE(visualViewport.layerForHorizontalScrollbar()->parent());
   EXPECT_TRUE(visualViewport.layerForVerticalScrollbar()->parent());
 }
 
 // Tests that the layout viewport's scroll layer bounds are updated in a
 // compositing change update. crbug.com/423188.
-TEST_P(ParameterizedVisualViewportTest,
-       TestChangingContentSizeAffectsScrollBounds) {
+TEST_P(VisualViewportTest, TestChangingContentSizeAffectsScrollBounds) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(100, 150));
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   WebLayer* scrollLayer = frameView.layerForScrolling()->platformLayer();
 
   webViewImpl()->mainFrame()->executeScript(
       WebScriptSource("var content = document.getElementById(\"content\");"
                       "content.style.width = \"1500px\";"
                       "content.style.height = \"2400px\";"));
   frameView.updateAllLifecyclePhases();
 
   EXPECT_SIZE_EQ(IntSize(1500, 2400), IntSize(scrollLayer->bounds()));
 }
 
 // Tests that resizing the visual viepwort keeps its bounds within the outer
 // viewport.
-TEST_P(ParameterizedVisualViewportTest,
-       ResizeVisualViewportStaysWithinOuterViewport) {
+TEST_P(VisualViewportTest, ResizeVisualViewportStaysWithinOuterViewport) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(100, 200));
 
   navigateTo("about:blank");
   webViewImpl()->updateAllLifecyclePhases();
 
   webViewImpl()->resizeVisualViewport(IntSize(100, 100));
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   visualViewport.move(ScrollOffset(0, 100));
 
   EXPECT_EQ(100, visualViewport.scrollOffset().height());
 
   webViewImpl()->resizeVisualViewport(IntSize(100, 200));
 
   EXPECT_EQ(0, visualViewport.scrollOffset().height());
 }
 
-TEST_P(ParameterizedVisualViewportTest,
-       ElementBoundsInViewportSpaceAccountsForViewport) {
+TEST_P(VisualViewportTest, ElementBoundsInViewportSpaceAccountsForViewport) {
   initializeWithAndroidSettings();
 
   webViewImpl()->resize(IntSize(500, 800));
 
   registerMockedHttpURLLoad("pinch-viewport-input-field.html");
   navigateTo(m_baseURL + "pinch-viewport-input-field.html");
 
   webViewImpl()->setInitialFocus(false);
   Element* inputElement = webViewImpl()->focusedElement();
 
   IntRect bounds = inputElement->layoutObject()->absoluteBoundingBoxRect();
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   IntPoint scrollDelta(250, 400);
   visualViewport.setScale(2);
   visualViewport.setLocation(scrollDelta);
 
   const IntRect boundsInViewport = inputElement->boundsInViewport();
   IntRect expectedBounds = bounds;
   expectedBounds.scale(2.f);
   IntPoint expectedScrollDelta = scrollDelta;
   expectedScrollDelta.scale(2.f, 2.f);
 
   EXPECT_POINT_EQ(IntPoint(expectedBounds.location() - expectedScrollDelta),
                   boundsInViewport.location());
   EXPECT_SIZE_EQ(expectedBounds.size(), boundsInViewport.size());
 }
 
-TEST_P(ParameterizedVisualViewportTest, ElementVisibleBoundsInVisualViewport) {
+TEST_P(VisualViewportTest, ElementVisibleBoundsInVisualViewport) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(640, 1080));
   registerMockedHttpURLLoad("viewport-select.html");
   navigateTo(m_baseURL + "viewport-select.html");
 
   ASSERT_EQ(2.0f, webViewImpl()->pageScaleFactor());
   webViewImpl()->setInitialFocus(false);
   Element* element = webViewImpl()->focusedElement();
   EXPECT_FALSE(element->visibleBoundsInVisualViewport().isEmpty());
 
   webViewImpl()->setPageScaleFactor(4.0);
   EXPECT_TRUE(element->visibleBoundsInVisualViewport().isEmpty());
 }
 
 // Test that the various window.scroll and document.body.scroll properties and
 // methods work unchanged from the pre-virtual viewport mode.
-TEST_P(ParameterizedVisualViewportTest,
-       bodyAndWindowScrollPropertiesAccountForViewport) {
+TEST_P(VisualViewportTest, bodyAndWindowScrollPropertiesAccountForViewport) {
   initializeWithAndroidSettings();
 
   webViewImpl()->resize(IntSize(200, 300));
 
   // Load page with no main frame scrolling.
   registerMockedHttpURLLoad("200-by-300-viewport.html");
   navigateTo(m_baseURL + "200-by-300-viewport.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
@@ skipping 58 matching lines @@
   EXPECT_EQ(0, body->scrollLeft());
   EXPECT_EQ(0, body->scrollTop());
   EXPECT_EQ(10, documentElement->scrollLeft());
   EXPECT_EQ(20, documentElement->scrollTop());
   EXPECT_EQ(10, window->scrollX());
   EXPECT_EQ(20, window->scrollY());
 }
 
 // Tests that when a new frame is created, it is created with the intended size
 // (i.e. viewport at minimum scale, 100x200 / 0.5).
-TEST_P(ParameterizedVisualViewportTest, TestMainFrameInitializationSizing) {
+TEST_P(VisualViewportTest, TestMainFrameInitializationSizing) {
   initializeWithAndroidSettings();
 
   webViewImpl()->resize(IntSize(100, 200));
 
   registerMockedHttpURLLoad("content-width-1000-min-scale.html");
   navigateTo(m_baseURL + "content-width-1000-min-scale.html");
 
   WebLocalFrameImpl* localFrame = webViewImpl()->mainFrameImpl();
   // The shutdown() calls are a hack to prevent this test from violating
   // invariants about frame state during navigation/detach.
   localFrame->frame()->document()->shutdown();
   localFrame->createFrameView();
 
   FrameView& frameView = *localFrame->frameView();
   EXPECT_SIZE_EQ(IntSize(200, 400), frameView.frameRect().size());
   frameView.dispose();
 }
 
 // Tests that the maximum scroll offset of the viewport can be fractional.
-TEST_P(ParameterizedVisualViewportTest, FractionalMaxScrollOffset) {
+TEST_P(VisualViewportTest, FractionalMaxScrollOffset) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(101, 201));
   navigateTo("about:blank");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   ScrollableArea* scrollableArea = &visualViewport;
 
   webViewImpl()->setPageScaleFactor(1.0);
   EXPECT_SIZE_EQ(ScrollOffset(), scrollableArea->maximumScrollOffset());
 
   webViewImpl()->setPageScaleFactor(2);
   EXPECT_SIZE_EQ(ScrollOffset(101. / 2., 201. / 2.),
                  scrollableArea->maximumScrollOffset());
 }
 
 // Tests that the slow scrolling after an impl scroll on the visual viewport is
 // continuous. crbug.com/453460 was caused by the impl-path not updating the
 // ScrollAnimatorBase class.
-TEST_P(ParameterizedVisualViewportTest, SlowScrollAfterImplScroll) {
+TEST_P(VisualViewportTest, SlowScrollAfterImplScroll) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(800, 600));
   navigateTo("about:blank");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
 
   // Apply some scroll and scale from the impl-side.
   webViewImpl()->applyViewportDeltas(WebFloatSize(300, 200), WebFloatSize(0, 0),
                                      WebFloatSize(0, 0), 2, 0);
@@ skipping 13 matching lines @@
 
   // The scroll sent from the impl-side must not be overwritten.
   EXPECT_SIZE_EQ(FloatSize(350, 260), visualViewport.scrollOffset());
 }
 
 static void accessibilitySettings(WebSettings* settings) {
   VisualViewportTest::configureSettings(settings);
   settings->setAccessibilityEnabled(true);
 }
 
-TEST_P(ParameterizedVisualViewportTest, AccessibilityHitTestWhileZoomedIn) {
+TEST_P(VisualViewportTest, AccessibilityHitTestWhileZoomedIn) {
   initializeWithDesktopSettings(accessibilitySettings);
 
   registerMockedHttpURLLoad("hit-test.html");
   navigateTo(m_baseURL + "hit-test.html");
 
   webViewImpl()->resize(IntSize(500, 500));
   webViewImpl()->updateAllLifecyclePhases();
 
   WebDocument webDoc = webViewImpl()->mainFrame()->document();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   webViewImpl()->setPageScaleFactor(2);
   webViewImpl()->setVisualViewportOffset(WebFloatPoint(200, 230));
   frameView.layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(400, 1100), ProgrammaticScroll);
 
   // FIXME(504057): PaintLayerScrollableArea dirties the compositing state.
   forceFullCompositingUpdate();
 
   // Because of where the visual viewport is located, this should hit the bottom
   // right target (target 4).
   WebAXObject hitNode =
       webDoc.accessibilityObject().hitTest(WebPoint(154, 165));
   WebAXNameFrom nameFrom;
   WebVector<WebAXObject> nameObjects;
   EXPECT_EQ(std::string("Target4"), hitNode.name(nameFrom, nameObjects).utf8());
 }
 
 // Tests that the maximum scroll offset of the viewport can be fractional.
-TEST_P(ParameterizedVisualViewportTest, TestCoordinateTransforms) {
+TEST_P(VisualViewportTest, TestCoordinateTransforms) {
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(800, 600));
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   VisualViewport& visualViewport =
       webViewImpl()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   // At scale = 1 the transform should be a no-op.
@@ skipping 33 matching lines @@
   EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 62), visualViewport.viewportToRootFrame(
                                                 FloatPoint(80, 100)));
   EXPECT_FLOAT_POINT_EQ(FloatPoint(80, 100),
                         visualViewport.rootFrameToViewport(FloatPoint(50, 62)));
 }
 
 // Tests that the window dimensions are available before a full layout occurs.
 // More specifically, it checks that the innerWidth and innerHeight window
 // properties will trigger a layout which will cause an update to viewport
 // constraints and a refreshed initial scale. crbug.com/466718
-TEST_P(ParameterizedVisualViewportTest, WindowDimensionsOnLoad) {
+TEST_P(VisualViewportTest, WindowDimensionsOnLoad) {
   initializeWithAndroidSettings();
   registerMockedHttpURLLoad("window_dimensions.html");
   webViewImpl()->resize(IntSize(800, 600));
   navigateTo(m_baseURL + "window_dimensions.html");
 
   Element* output = frame()->document()->getElementById("output");
   DCHECK(output);
   EXPECT_EQ(std::string("1600x1200"),
             std::string(output->innerHTML().ascii().data()));
 }
 
 // Similar to above but make sure the initial scale is updated with the content
 // width for a very wide page. That is, make that innerWidth/Height actually
 // trigger a layout of the content, and not just an update of the viepwort.
 // crbug.com/466718
-TEST_P(ParameterizedVisualViewportTest, WindowDimensionsOnLoadWideContent) {
+TEST_P(VisualViewportTest, WindowDimensionsOnLoadWideContent) {
   initializeWithAndroidSettings();
   registerMockedHttpURLLoad("window_dimensions_wide_div.html");
   webViewImpl()->resize(IntSize(800, 600));
   navigateTo(m_baseURL + "window_dimensions_wide_div.html");
 
   Element* output = frame()->document()->getElementById("output");
   DCHECK(output);
   EXPECT_EQ(std::string("2000x1500"),
             std::string(output->innerHTML().ascii().data()));
 }
 
-TEST_P(ParameterizedVisualViewportTest,
-       PinchZoomGestureScrollsVisualViewportOnly) {
+TEST_P(VisualViewportTest, PinchZoomGestureScrollsVisualViewportOnly) {
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(100, 100));
 
   registerMockedHttpURLLoad("200-by-800-viewport.html");
   navigateTo(m_baseURL + "200-by-800-viewport.html");
 
   WebGestureEvent pinchUpdate;
   pinchUpdate.type = WebInputEvent::GesturePinchUpdate;
   pinchUpdate.sourceDevice = WebGestureDeviceTouchpad;
   pinchUpdate.x = 100;
   pinchUpdate.y = 100;
   pinchUpdate.data.pinchUpdate.scale = 2;
   pinchUpdate.data.pinchUpdate.zoomDisabled = false;
 
   webViewImpl()->handleInputEvent(pinchUpdate);
 
   VisualViewport& visualViewport =
       webViewImpl()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 50), visualViewport.scrollOffset());
   EXPECT_SIZE_EQ(ScrollOffset(0, 0),
                  frameView.layoutViewportScrollableArea()->scrollOffset());
 }
 
-TEST_P(ParameterizedVisualViewportTest, ResizeWithScrollAnchoring) {
+TEST_P(VisualViewportTest, ResizeWithScrollAnchoring) {
   bool wasScrollAnchoringEnabled =
       RuntimeEnabledFeatures::scrollAnchoringEnabled();
   RuntimeEnabledFeatures::setScrollAnchoringEnabled(true);
 
   initializeWithDesktopSettings();
   webViewImpl()->resize(IntSize(800, 600));
 
   registerMockedHttpURLLoad("icb-relative-content.html");
   navigateTo(m_baseURL + "icb-relative-content.html");
 
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   frameView.layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(700, 500), ProgrammaticScroll);
   webViewImpl()->updateAllLifecyclePhases();
 
   webViewImpl()->resize(IntSize(800, 300));
   EXPECT_SIZE_EQ(ScrollOffset(700, 200),
                  frameView.layoutViewportScrollableArea()->scrollOffset());
 
   RuntimeEnabledFeatures::setScrollAnchoringEnabled(wasScrollAnchoringEnabled);
 }
 
 // Ensure that resize anchoring as happens when browser controls hide/show
 // affects the scrollable area that's currently set as the root scroller.
-TEST_P(ParameterizedVisualViewportTest, ResizeAnchoringWithRootScroller) {
+TEST_P(VisualViewportTest, ResizeAnchoringWithRootScroller) {
   bool wasRootScrollerEnabled =
       RuntimeEnabledFeatures::setRootScrollerEnabled();
   RuntimeEnabledFeatures::setSetRootScrollerEnabled(true);
 
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(800, 600));
 
   registerMockedHttpURLLoad("root-scroller-div.html");
   navigateTo(m_baseURL + "root-scroller-div.html");
 
@@ skipping 14 matching lines @@
   webViewImpl()->resize(IntSize(800, 500));
 
   EXPECT_SIZE_EQ(ScrollOffset(),
                  frameView.layoutViewportScrollableArea()->scrollOffset());
 
   RuntimeEnabledFeatures::setSetRootScrollerEnabled(wasRootScrollerEnabled);
 }
 
 // Ensure that resize anchoring as happens when the device is rotated affects
 // the scrollable area that's currently set as the root scroller.
-TEST_P(ParameterizedVisualViewportTest, RotationAnchoringWithRootScroller) {
+TEST_P(VisualViewportTest, RotationAnchoringWithRootScroller) {
   bool wasRootScrollerEnabled =
       RuntimeEnabledFeatures::setRootScrollerEnabled();
   RuntimeEnabledFeatures::setSetRootScrollerEnabled(true);
 
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(800, 600));
 
   registerMockedHttpURLLoad("root-scroller-div.html");
   navigateTo(m_baseURL + "root-scroller-div.html");
 
@@ skipping 19 matching lines @@
   settings->setAcceleratedCompositingEnabled(true);
   settings->setPreferCompositingToLCDTextEnabled(true);
   settings->setViewportMetaEnabled(true);
   settings->setViewportEnabled(true);
   settings->setMainFrameResizesAreOrientationChanges(true);
   settings->setShrinksViewportContentToFit(true);
 }
 
 // Make sure a composited background-attachment:fixed background gets resized
 // when using inert (non-layout affecting) browser controls.
-TEST_P(ParameterizedVisualViewportTest, ResizeCompositedAndFixedBackground) {
+TEST_P(VisualViewportTest, ResizeCompositedAndFixedBackground) {
   bool originalInertTopControls =
       RuntimeEnabledFeatures::inertTopControlsEnabled();
   RuntimeEnabledFeatures::setInertTopControlsEnabled(true);
 
   std::unique_ptr<FrameTestHelpers::TestWebViewClient>
       fakeCompositingWebViewClient =
           wrapUnique(new FrameTestHelpers::TestWebViewClient());
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl = webViewHelper.initialize(
       true, nullptr, fakeCompositingWebViewClient.get(), nullptr,
@@ skipping 66 matching lines @@
   settings->setAcceleratedCompositingEnabled(true);
   settings->setPreferCompositingToLCDTextEnabled(false);
   settings->setViewportMetaEnabled(true);
   settings->setViewportEnabled(true);
   settings->setMainFrameResizesAreOrientationChanges(true);
   settings->setShrinksViewportContentToFit(true);
 }
 
 // Make sure a non-composited background-attachment:fixed background gets
 // resized when using inert (non-layout affecting) browser controls.
-TEST_P(ParameterizedVisualViewportTest, ResizeNonCompositedAndFixedBackground) {
+TEST_P(VisualViewportTest, ResizeNonCompositedAndFixedBackground) {
   bool originalInertTopControls =
       RuntimeEnabledFeatures::inertTopControlsEnabled();
   RuntimeEnabledFeatures::setInertTopControlsEnabled(true);
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl = webViewHelper.initialize(
       true, nullptr, nullptr, nullptr, &configureAndroidNonCompositing);
 
   int pageWidth = 640;
   int pageHeight = 480;
@@ skipping 82 matching lines @@
   expectedHeight = rootLayerScrolling ? 480 : 1000;
   EXPECT_EQ(1u, rasterInvalidations->size());
   EXPECT_EQ(IntRect(0, 0, 640, expectedHeight), (*rasterInvalidations)[0].rect);
 
   document->view()->setTracksPaintInvalidations(false);
   RuntimeEnabledFeatures::setInertTopControlsEnabled(originalInertTopControls);
 }
 
 // Make sure a browser control resize with background-attachment:not-fixed
 // background doesn't cause invalidation or layout.
-TEST_P(ParameterizedVisualViewportTest,
-       ResizeNonFixedBackgroundNoLayoutOrInvalidation) {
+TEST_P(VisualViewportTest, ResizeNonFixedBackgroundNoLayoutOrInvalidation) {
   bool originalInertTopControls =
       RuntimeEnabledFeatures::inertTopControlsEnabled();
   RuntimeEnabledFeatures::setInertTopControlsEnabled(true);
 
   std::unique_ptr<FrameTestHelpers::TestWebViewClient>
       fakeCompositingWebViewClient =
           wrapUnique(new FrameTestHelpers::TestWebViewClient());
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl = webViewHelper.initialize(
       true, nullptr, fakeCompositingWebViewClient.get(), nullptr,
@@ skipping 63 matching lines @@
   if (rootLayerScrolling)
     EXPECT_TRUE(invalidationTracking);
   else
     EXPECT_FALSE(invalidationTracking);
 
   document->view()->setTracksPaintInvalidations(false);
   RuntimeEnabledFeatures::setInertTopControlsEnabled(originalInertTopControls);
 }
 
 }  // namespace