Rename classes related to top controls

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/RootFrameViewport.h"
-#include "core/frame/TopControls.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/RootScrollerController.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/PaintLayerScrollableArea.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
@@ skipping 32 matching lines @@
     WebCache::clear();
   }
 
   WebViewImpl* initialize(const std::string& pageName,
                           FrameTestHelpers::TestWebViewClient* client) {
     RuntimeEnabledFeatures::setSetRootScrollerEnabled(true);
 
     m_helper.initializeAndLoad(m_baseURL + pageName, true, nullptr, client,
                                nullptr, &configureSettings);
 
-    // Initialize top controls to be shown.
-    webViewImpl()->resizeWithTopControls(IntSize(400, 400), 50, true);
-    webViewImpl()->topControls().setShownRatio(1);
+    // Initialize browser controls to be shown.
+    webViewImpl()->resizeWithBrowserControls(IntSize(400, 400), 50, true);
+    webViewImpl()->browserControls().setShownRatio(1);
 
     mainFrameView()->updateAllLifecyclePhases();
 
     return webViewImpl();
   }
 
   WebViewImpl* initialize(const std::string& pageName) {
     return initialize(pageName, &m_client);
   }
 
@@ skipping 33 matching lines @@
   WebLocalFrame* mainWebFrame() const { return webViewImpl()->mainFrameImpl(); }
 
   FrameView* mainFrameView() const {
     return webViewImpl()->mainFrameImpl()->frame()->view();
   }
 
   VisualViewport& visualViewport() const {
     return frameHost().visualViewport();
   }
 
-  TopControls& topControls() const { return frameHost().topControls(); }
+  BrowserControls& browserControls() const {
+    return frameHost().browserControls();
+  }
 
   Element* effectiveRootScroller(Document* doc) const {
     return doc->rootScrollerController()->effectiveRootScroller();
   }
 
   WebGestureEvent generateTouchGestureEvent(WebInputEvent::Type type,
                                             int deltaX = 0,
                                             int deltaY = 0) {
     return generateGestureEvent(type, WebGestureDeviceTouchscreen, deltaX,
                                 deltaY);
@@ skipping 60 matching lines @@
   mainFrame()->document()->setRootScroller(container, exceptionState);
   ASSERT_EQ(container, mainFrame()->document()->rootScroller());
 
   // Content is 1000x1000, WebView size is 400x400 so max scroll is 600px.
   double maximumScroll = 600;
 
   webViewImpl()->handleInputEvent(
       generateTouchGestureEvent(WebInputEvent::GestureScrollBegin));
 
   {
-    // Scrolling over the #container DIV should cause the top controls to
+    // Scrolling over the #container DIV should cause the browser controls to
     // hide.
-    EXPECT_FLOAT_EQ(1, topControls().shownRatio());
+    EXPECT_FLOAT_EQ(1, browserControls().shownRatio());
     webViewImpl()->handleInputEvent(generateTouchGestureEvent(
-        WebInputEvent::GestureScrollUpdate, 0, -topControls().height()));
-    EXPECT_FLOAT_EQ(0, topControls().shownRatio());
+        WebInputEvent::GestureScrollUpdate, 0, -browserControls().height()));
+    EXPECT_FLOAT_EQ(0, browserControls().shownRatio());
   }
 
   {
     // Make sure we're actually scrolling the DIV and not the FrameView.
     webViewImpl()->handleInputEvent(
         generateTouchGestureEvent(WebInputEvent::GestureScrollUpdate, 0, -100));
     EXPECT_FLOAT_EQ(100, container->scrollTop());
     EXPECT_FLOAT_EQ(0, mainFrameView()->scrollOffset().height());
   }
 
@@ skipping 35 matching lines @@
         generateTouchGestureEvent(WebInputEvent::GestureScrollUpdate, 0, -30));
     EXPECT_FLOAT_EQ(maximumScroll, container->scrollTop());
     EXPECT_FLOAT_EQ(0, mainFrameView()->scrollOffset().height());
     Mock::VerifyAndClearExpectations(&client);
 
     webViewImpl()->handleInputEvent(
         generateTouchGestureEvent(WebInputEvent::GestureScrollEnd));
   }
 
   {
-    // Scrolling up should show the top controls.
+    // Scrolling up should show the browser controls.
     webViewImpl()->handleInputEvent(
         generateTouchGestureEvent(WebInputEvent::GestureScrollBegin));
 
-    EXPECT_FLOAT_EQ(0, topControls().shownRatio());
+    EXPECT_FLOAT_EQ(0, browserControls().shownRatio());
     webViewImpl()->handleInputEvent(
         generateTouchGestureEvent(WebInputEvent::GestureScrollUpdate, 0, 30));
-    EXPECT_FLOAT_EQ(0.6, topControls().shownRatio());
+    EXPECT_FLOAT_EQ(0.6, browserControls().shownRatio());
 
     webViewImpl()->handleInputEvent(
         generateTouchGestureEvent(WebInputEvent::GestureScrollEnd));
   }
 
   // Reset manually to avoid lifetime issues with custom WebViewClient.
   m_helper.reset();
 }
 
 // Tests that removing the element that is the root scroller from the DOM tree
@@ skipping 648 matching lines @@
   EXPECT_EQ(mainFrame()->document()->documentElement(),
             globalController.globalRootScroller());
   EXPECT_EQ(
       mainFrameView()->layoutViewportScrollableArea()->layerForScrolling(),
       globalController.rootScrollerLayer());
 }
 
 }  // namespace
 
 }  // namespace blink