Change all test cases to use WebViewBase instead of WebViewImpl.

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

 /*
  * Copyright (C) 2015 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 19 matching lines @@
 #include "core/frame/BrowserControls.h"
 
 #include "core/dom/ClientRect.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/VisualViewport.h"
 #include "core/page/Page.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebCoalescedInputEvent.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebSettings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 
 namespace blink {
 
@@ skipping 12 matching lines @@
     RegisterMockedHttpURLLoad("vh-height-width-800.html");
     RegisterMockedHttpURLLoad("vh-height-width-800-extra-wide.html");
   }
 
   ~BrowserControlsTest() override {
     Platform::Current()
         ->GetURLLoaderMockFactory()
         ->UnregisterAllURLsAndClearMemoryCache();
   }
 
-  WebViewImpl* Initialize(const std::string& page_name = "large-div.html") {
+  WebViewBase* Initialize(const std::string& page_name = "large-div.html") {
     RuntimeEnabledFeatures::setInertTopControlsEnabled(true);
 
     // Load a page with large body and set viewport size to 400x400 to ensure
     // main frame is scrollable.
     helper_.InitializeAndLoad(base_url_ + page_name, true, nullptr, nullptr,
                               nullptr, &ConfigureSettings);
 
-    GetWebViewImpl()->Resize(IntSize(400, 400));
-    return GetWebViewImpl();
+    GetWebView()->Resize(IntSize(400, 400));
+    return GetWebView();
   }
 
   static void ConfigureSettings(WebSettings* settings) {
     settings->SetJavaScriptEnabled(true);
     settings->SetAcceleratedCompositingEnabled(true);
     settings->SetPreferCompositingToLCDTextEnabled(true);
     // Android settings
     settings->SetViewportEnabled(true);
     settings->SetViewportMetaEnabled(true);
     settings->SetShrinksViewportContentToFit(true);
@@ skipping 15 matching lines @@
     event.x = 100;
     event.y = 100;
     if (type == WebInputEvent::kGestureScrollUpdate) {
       event.data.scroll_update.delta_x = delta_x;
       event.data.scroll_update.delta_y = delta_y;
     }
     return WebCoalescedInputEvent(event);
   }
 
   void VerticalScroll(float delta_y) {
-    GetWebViewImpl()->HandleInputEvent(
+    GetWebView()->HandleInputEvent(
         GenerateEvent(WebInputEvent::kGestureScrollBegin));
-    GetWebViewImpl()->HandleInputEvent(
+    GetWebView()->HandleInputEvent(
         GenerateEvent(WebInputEvent::kGestureScrollUpdate, 0, delta_y));
-    GetWebViewImpl()->HandleInputEvent(
+    GetWebView()->HandleInputEvent(
         GenerateEvent(WebInputEvent::kGestureScrollEnd));
   }
 
   Element* GetElementById(const WebString& id) {
     return static_cast<Element*>(
-        GetWebViewImpl()->MainFrame()->GetDocument().GetElementById(id));
+        GetWebView()->MainFrame()->GetDocument().GetElementById(id));
   }
 
-  WebViewImpl* GetWebViewImpl() const { return helper_.WebView(); }
+  WebViewBase* GetWebView() const { return helper_.WebView(); }
   LocalFrame* GetFrame() const {
     return helper_.WebView()->MainFrameImpl()->GetFrame();
   }
   VisualViewport& GetVisualViewport() const {
     return helper_.WebView()->GetPage()->GetVisualViewport();
   }
 
  private:
   std::string base_url_;
   FrameTestHelpers::WebViewHelper helper_;
 };
 
 #define EXPECT_SIZE_EQ(expected, actual)                     \
   do {                                                       \
     EXPECT_FLOAT_EQ((expected).Width(), (actual).Width());   \
     EXPECT_FLOAT_EQ((expected).Height(), (actual).Height()); \
   } while (false)
 
 // Disable these tests on Mac OSX until further investigation.
 // Local build on Mac is OK but the bot fails. This is not an issue as
 // Browser Controls are currently only used on Android.
 #if OS(MACOSX)
 #define MAYBE(test) DISABLED_##test
 #else
 #define MAYBE(test) test
 #endif
 
 // Scrolling down should hide browser controls.
 TEST_F(BrowserControlsTest, MAYBE(HideOnScrollDown)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   // initialize browser controls to be shown.
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
 
   web_view->HandleInputEvent(GenerateEvent(WebInputEvent::kGestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
 
   // Browser controls should be scrolled partially and page should not scroll.
   web_view->HandleInputEvent(
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, 0, -25.f));
@@ skipping 16 matching lines @@
   web_view->HandleInputEvent(
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, 0, -20.f));
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 35),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 }
 
 // Scrolling up should show browser controls.
 TEST_F(BrowserControlsTest, MAYBE(ShowOnScrollUp)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   // initialize browser controls to be hidden.
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, false);
   web_view->GetBrowserControls().SetShownRatio(0);
 
   web_view->HandleInputEvent(GenerateEvent(WebInputEvent::kGestureScrollBegin));
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
 
   web_view->HandleInputEvent(
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, 0, 10.f));
   EXPECT_FLOAT_EQ(10.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 0),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 
   web_view->HandleInputEvent(
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, 0, 50.f));
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 0),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 }
 
 // Scrolling up after previous scroll downs should cause browser controls to be
 // shown only after all previously scrolled down amount is compensated.
 TEST_F(BrowserControlsTest, MAYBE(ScrollDownThenUp)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   // initialize browser controls to be shown and position page at 100px.
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
   GetFrame()->View()->GetScrollableArea()->SetScrollOffset(ScrollOffset(0, 100),
                                                            kProgrammaticScroll);
 
   web_view->HandleInputEvent(GenerateEvent(WebInputEvent::kGestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
 
   // Scroll down to completely hide browser controls. Excess deltaY (100px)
@@ skipping 35 matching lines @@
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, 0, 70.f));
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 50),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 }
 
 // Scrolling down should always cause visible browser controls to start hiding
 // even if we have been scrolling up previously.
 TEST_F(BrowserControlsTest, MAYBE(ScrollUpThenDown)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   // initialize browser controls to be hidden and position page at 100px.
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, false);
   web_view->GetBrowserControls().SetShownRatio(0);
   GetFrame()->View()->GetScrollableArea()->SetScrollOffset(ScrollOffset(0, 100),
                                                            kProgrammaticScroll);
 
   web_view->HandleInputEvent(GenerateEvent(WebInputEvent::kGestureScrollBegin));
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
 
   // Scroll up to completely show browser controls. Excess deltaY (50px) should
@@ skipping 16 matching lines @@
   web_view->HandleInputEvent(
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, 0, -60.f));
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 100),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 }
 
 // Browser controls should not consume horizontal scroll.
 TEST_F(BrowserControlsTest, MAYBE(HorizontalScroll)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   // initialize browser controls to be shown.
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
 
   web_view->HandleInputEvent(GenerateEvent(WebInputEvent::kGestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
 
   // Browser controls should not consume horizontal scroll.
   web_view->HandleInputEvent(
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, -110.f, -100.f));
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(110, 50),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 
   web_view->HandleInputEvent(
       GenerateEvent(WebInputEvent::kGestureScrollUpdate, -40.f, 0));
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(150, 50),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 }
 
 // Page scale should not impact browser controls scrolling
 TEST_F(BrowserControlsTest, MAYBE(PageScaleHasNoImpact)) {
-  WebViewImpl* web_view = Initialize();
-  GetWebViewImpl()->SetDefaultPageScaleLimits(0.25f, 5);
+  WebViewBase* web_view = Initialize();
+  GetWebView()->SetDefaultPageScaleLimits(0.25f, 5);
   web_view->SetPageScaleFactor(2.0);
 
   // Initialize browser controls to be shown.
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
 
   web_view->HandleInputEvent(GenerateEvent(WebInputEvent::kGestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
 
   // Browser controls should be scrolled partially and page should not scroll.
@@ skipping 33 matching lines @@
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(ScrollOffset(0, 0),
                  GetFrame()->View()->GetScrollableArea()->GetScrollOffset());
 }
 
 // Some scroll deltas result in a shownRatio that can't be realized in a
 // floating-point number. Make sure that if the browser controls aren't fully
 // scrolled, scrollBy doesn't return any excess delta. i.e. There should be no
 // slippage between the content and browser controls.
 TEST_F(BrowserControlsTest, MAYBE(FloatingPointSlippage)) {
-  WebViewImpl* web_view = Initialize();
-  GetWebViewImpl()->SetDefaultPageScaleLimits(0.25f, 5);
+  WebViewBase* web_view = Initialize();
+  GetWebView()->SetDefaultPageScaleLimits(0.25f, 5);
   web_view->SetPageScaleFactor(2.0);
 
   // Initialize browser controls to be shown.
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
 
   web_view->GetBrowserControls().ScrollBegin();
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
 
   // This will result in a 20px scroll to the browser controls so the show ratio
   // will be 30/50 == 0.6 which is not representible in a float. Make sure
   // that scroll still consumes the whole delta.
   FloatSize remaining_delta =
       web_view->GetBrowserControls().ScrollBy(FloatSize(0, 10));
   EXPECT_EQ(0, remaining_delta.Height());
 }
 
 // Scrollable subregions should scroll before browser controls
 TEST_F(BrowserControlsTest, MAYBE(ScrollableSubregionScrollFirst)) {
-  WebViewImpl* web_view = Initialize("overflow-scrolling.html");
+  WebViewBase* web_view = Initialize("overflow-scrolling.html");
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
   GetFrame()->View()->GetScrollableArea()->SetScrollOffset(ScrollOffset(0, 50),
                                                            kProgrammaticScroll);
 
   // Test scroll down
   // Scroll down should scroll the overflow div first but browser controls and
   // main frame should not scroll.
   VerticalScroll(-800.f);
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
@@ skipping 35 matching lines @@
   // Continued scroll down up scroll up the main frame
   VerticalScroll(40.f);
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 50),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 }
 
 // Scrollable iframes should scroll before browser controls
 TEST_F(BrowserControlsTest, MAYBE(ScrollableIframeScrollFirst)) {
-  WebViewImpl* web_view = Initialize("iframe-scrolling.html");
+  WebViewBase* web_view = Initialize("iframe-scrolling.html");
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
   GetFrame()->View()->GetScrollableArea()->SetScrollOffset(ScrollOffset(0, 50),
                                                            kProgrammaticScroll);
 
   // Test scroll down
   // Scroll down should scroll the iframe first but browser controls and main
   // frame should not scroll.
   VerticalScroll(-800.f);
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
@@ skipping 35 matching lines @@
   // Continued scroll down up scroll up the main frame
   VerticalScroll(40.f);
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 50),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 }
 
 // Browser controls visibility should remain consistent when height is changed.
 TEST_F(BrowserControlsTest, MAYBE(HeightChangeMaintainsVisibility)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   web_view->ResizeWithBrowserControls(web_view->Size(), 20.f, false);
   web_view->GetBrowserControls().SetShownRatio(0);
 
   web_view->ResizeWithBrowserControls(web_view->Size(), 20.f, false);
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
 
   web_view->ResizeWithBrowserControls(web_view->Size(), 40.f, false);
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
 
   // Scroll up to show browser controls.
   VerticalScroll(40.f);
   EXPECT_FLOAT_EQ(40.f, web_view->GetBrowserControls().ContentOffset());
 
   // Changing height of a fully shown browser controls should correctly adjust
   // content offset
   web_view->ResizeWithBrowserControls(web_view->Size(), 30.f, false);
   EXPECT_FLOAT_EQ(30.f, web_view->GetBrowserControls().ContentOffset());
 }
 
 // Zero delta should not have any effect on browser controls.
 TEST_F(BrowserControlsTest, MAYBE(ZeroHeightMeansNoEffect)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   web_view->ResizeWithBrowserControls(web_view->Size(), 0, false);
   web_view->GetBrowserControls().SetShownRatio(0);
   GetFrame()->View()->GetScrollableArea()->SetScrollOffset(ScrollOffset(0, 100),
                                                            kProgrammaticScroll);
 
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
 
   VerticalScroll(20.f);
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 80),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 
   VerticalScroll(-30.f);
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
   EXPECT_SIZE_EQ(
       ScrollOffset(0, 110),
       GetFrame()->View()->LayoutViewportScrollableArea()->GetScrollOffset());
 
   web_view->GetBrowserControls().SetShownRatio(1);
   EXPECT_FLOAT_EQ(0.f, web_view->GetBrowserControls().ContentOffset());
 }
 
 // Browser controls should not hide when scrolling up past limit
 TEST_F(BrowserControlsTest, MAYBE(ScrollUpPastLimitDoesNotHide)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   // Initialize browser controls to be shown
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, true);
   web_view->GetBrowserControls().SetShownRatio(1);
   // Use 2x scale so that both visual viewport and frameview are scrollable
   web_view->SetPageScaleFactor(2.0);
 
   // Fully scroll frameview but visualviewport remains scrollable
   web_view->MainFrame()->SetScrollOffset(WebSize(0, 10000));
   GetVisualViewport().SetLocation(FloatPoint(0, 0));
   VerticalScroll(-10.f);
@@ skipping 12 matching lines @@
   GetVisualViewport().SetLocation(FloatPoint(0, 10000));
   VerticalScroll(-30.f);
   // Browser controls should not move because neither frameview nor visual
   // viewport
   // are scrollable
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
 }
 
 // Browser controls should honor its constraints
 TEST_F(BrowserControlsTest, MAYBE(StateConstraints)) {
-  WebViewImpl* web_view = Initialize();
+  WebViewBase* web_view = Initialize();
   web_view->ResizeWithBrowserControls(web_view->Size(), 50.f, false);
   GetFrame()->View()->GetScrollableArea()->SetScrollOffset(ScrollOffset(0, 100),
                                                            kProgrammaticScroll);
 
   // Setting permitted state should change the content offset to match the
   // constraint.
   web_view->UpdateBrowserControlsState(kWebBrowserControlsShown,
                                        kWebBrowserControlsShown, false);
   EXPECT_FLOAT_EQ(50.f, web_view->GetBrowserControls().ContentOffset());
 
@@ skipping 59 matching lines @@
 
   web_view->UpdateBrowserControlsState(kWebBrowserControlsShown,
                                        kWebBrowserControlsBoth, false);
   EXPECT_FLOAT_EQ(50, web_view->GetBrowserControls().ContentOffset());
 }
 
 // Ensure that browser controls do not affect the layout by showing and hiding
 // except for position: fixed elements.
 TEST_F(BrowserControlsTest, MAYBE(DontAffectLayoutHeight)) {
   // Initialize with the browser controls showing.
-  WebViewImpl* web_view = Initialize("percent-height.html");
+  WebViewBase* web_view = Initialize("percent-height.html");
   web_view->ResizeWithBrowserControls(WebSize(400, 300), 100.f, true);
   web_view->UpdateBrowserControlsState(kWebBrowserControlsBoth,
                                        kWebBrowserControlsShown, false);
   web_view->GetBrowserControls().SetShownRatio(1);
   web_view->UpdateAllLifecyclePhases();
 
   ASSERT_EQ(100.f, web_view->GetBrowserControls().ContentOffset());
 
   // When the browser controls are showing, there's 300px for the layout height
   // so
@@ skipping 23 matching lines @@
 
   // The layout size should not change as a result of browser controls hiding.
   EXPECT_EQ(300,
             GetFrame()->View()->GetLayoutSize(kIncludeScrollbars).Height());
 }
 
 // Ensure that browser controls do not affect the layout by showing and hiding
 // except for position: fixed elements.
 TEST_F(BrowserControlsTest, MAYBE(AffectLayoutHeightWhenConstrained)) {
   // Initialize with the browser controls showing.
-  WebViewImpl* web_view = Initialize("percent-height.html");
+  WebViewBase* web_view = Initialize("percent-height.html");
   web_view->ResizeWithBrowserControls(WebSize(400, 300), 100.f, true);
   web_view->UpdateBrowserControlsState(kWebBrowserControlsBoth,
                                        kWebBrowserControlsShown, false);
   web_view->GetBrowserControls().SetShownRatio(1);
   web_view->UpdateAllLifecyclePhases();
 
   Element* abs_pos = GetElementById(WebString::FromUTF8("abs"));
   Element* fixed_pos = GetElementById(WebString::FromUTF8("fixed"));
 
   ASSERT_EQ(100.f, web_view->GetBrowserControls().ContentOffset());
@@ skipping 65 matching lines @@
   EXPECT_FLOAT_EQ(200.f, abs_pos->getBoundingClientRect()->height());
   EXPECT_FLOAT_EQ(200.f, fixed_pos->getBoundingClientRect()->height());
 
   EXPECT_EQ(400,
             GetFrame()->View()->GetLayoutSize(kIncludeScrollbars).Height());
 }
 
 // Ensure that browser controls do not affect vh units.
 TEST_F(BrowserControlsTest, MAYBE(DontAffectVHUnits)) {
   // Initialize with the browser controls showing.
-  WebViewImpl* web_view = Initialize("vh-height.html");
+  WebViewBase* web_view = Initialize("vh-height.html");
   web_view->ResizeWithBrowserControls(WebSize(400, 300), 100.f, true);
   web_view->UpdateBrowserControlsState(kWebBrowserControlsBoth,
                                        kWebBrowserControlsShown, false);
   web_view->GetBrowserControls().SetShownRatio(1);
   web_view->UpdateAllLifecyclePhases();
 
   ASSERT_EQ(100.f, web_view->GetBrowserControls().ContentOffset());
 
   // 'vh' units should be based on the viewport when the browser controls are
   // hidden.
@@ skipping 21 matching lines @@
   // The viewport size used for vh units should not change as a result of top
   // controls hiding.
   EXPECT_EQ(400, GetFrame()->View()->ViewportSizeForViewportUnits().Height());
 }
 
 // Ensure that on a legacy page (there's a non-1 minimum scale) 100vh units fill
 // the viewport, with browser controls hidden, when the viewport encompasses the
 // layout width.
 TEST_F(BrowserControlsTest, MAYBE(DontAffectVHUnitsWithScale)) {
   // Initialize with the browser controls showing.
-  WebViewImpl* web_view = Initialize("vh-height-width-800.html");
+  WebViewBase* web_view = Initialize("vh-height-width-800.html");
   web_view->ResizeWithBrowserControls(WebSize(400, 300), 100.f, true);
   web_view->UpdateBrowserControlsState(kWebBrowserControlsBoth,
                                        kWebBrowserControlsShown, false);
   web_view->GetBrowserControls().SetShownRatio(1);
   web_view->UpdateAllLifecyclePhases();
 
   ASSERT_EQ(100.f, web_view->GetBrowserControls().ContentOffset());
 
   // Device viewport is 400px but the page is width=800 so minimum-scale
   // should be 0.5. This is also the scale at which the viewport fills the
@@ skipping 29 matching lines @@
   // controls hiding.
   EXPECT_EQ(800, GetFrame()->View()->ViewportSizeForViewportUnits().Height());
 }
 
 // Ensure that on a legacy page (there's a non-1 minimum scale) whose viewport
 // at minimum-scale is larger than the layout size, 100vh units fill the
 // viewport, with browser controls hidden, when the viewport is scaled such that
 // its width equals the layout width.
 TEST_F(BrowserControlsTest, MAYBE(DontAffectVHUnitsUseLayoutSize)) {
   // Initialize with the browser controls showing.
-  WebViewImpl* web_view = Initialize("vh-height-width-800-extra-wide.html");
+  WebViewBase* web_view = Initialize("vh-height-width-800-extra-wide.html");
   web_view->ResizeWithBrowserControls(WebSize(400, 300), 100.f, true);
   web_view->UpdateBrowserControlsState(kWebBrowserControlsBoth,
                                        kWebBrowserControlsShown, false);
   web_view->GetBrowserControls().SetShownRatio(1);
   web_view->UpdateAllLifecyclePhases();
 
   ASSERT_EQ(100.f, web_view->GetBrowserControls().ContentOffset());
 
   // Device viewport is 400px and page is width=800 but there's an element
   // that's 1600px wide so the minimum scale is 0.25 to encompass that.
@@ skipping 13 matching lines @@
 TEST_F(BrowserControlsTest,
        MAYBE(AnchorViewportDuringbrowserControlsAdjustment)) {
   int content_height = 1016;
   int layout_viewport_height = 500;
   int visual_viewport_height = 500;
   int browser_controls_height = 100;
   int page_scale = 2;
   int min_scale = 1;
 
   // Initialize with the browser controls showing.
-  WebViewImpl* web_view = Initialize("large-div.html");
-  GetWebViewImpl()->SetDefaultPageScaleLimits(min_scale, 5);
+  WebViewBase* web_view = Initialize("large-div.html");
+  GetWebView()->SetDefaultPageScaleLimits(min_scale, 5);
   web_view->ResizeWithBrowserControls(WebSize(800, layout_viewport_height),
                                       browser_controls_height, true);
   web_view->UpdateBrowserControlsState(kWebBrowserControlsBoth,
                                        kWebBrowserControlsShown, false);
   web_view->GetBrowserControls().SetShownRatio(1);
   web_view->UpdateAllLifecyclePhases();
 
   FrameView* view = GetFrame()->View();
   ScrollableArea* root_viewport = GetFrame()->View()->GetScrollableArea();
 
@@ skipping 61 matching lines @@
 }
 
 // Ensure that vh units are correct when browser controls are in a locked
 // state. That is, normally we need to add the browser controls height to vh
 // units since 100vh includes the browser controls even if they're hidden while
 // the ICB height does not. When the controls are locked hidden, the ICB size
 // is the full viewport height so there's no need to add the browser controls
 // height.  crbug.com/688738.
 TEST_F(BrowserControlsTest, MAYBE(ViewportUnitsWhenControlsLocked)) {
   // Initialize with the browser controls showing.
-  WebViewImpl* web_view = Initialize("vh-height.html");
+  WebViewBase* web_view = Initialize("vh-height.html");
   web_view->ResizeWithBrowserControls(WebSize(400, 300), 100.f, true);
   web_view->UpdateBrowserControlsState(kWebBrowserControlsBoth,
                                        kWebBrowserControlsShown, false);
   web_view->GetBrowserControls().SetShownRatio(1);
   web_view->UpdateAllLifecyclePhases();
 
   ASSERT_EQ(100.f, web_view->GetBrowserControls().ContentOffset());
   ASSERT_EQ(300, GetFrame()->View()->GetLayoutSize().Height());
 
   Element* abs_pos = GetElementById(WebString::FromUTF8("abs"));
@@ skipping 30 matching lines @@
 
     // Make sure we're not adding the browser controls height to the vh units as
     // when they're locked to hidden, the ICB fills the entire viewport already.
     EXPECT_FLOAT_EQ(200.f, abs_pos->getBoundingClientRect()->height());
     EXPECT_FLOAT_EQ(200.f, fixed_pos->getBoundingClientRect()->height());
     EXPECT_EQ(400, GetFrame()->View()->ViewportSizeForViewportUnits().Height());
   }
 }
 
 }  // namespace blink