Remove FrameHost::browserControls()

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/dom/ClientRect.h"
 #include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/frame/VisualViewport.h"
@@ skipping 80 matching lines @@
   }
 
   void executeScript(const WebString& code, WebLocalFrame& frame) {
     frame.executeScript(WebScriptSource(code));
     frame.view()->updateAllLifecyclePhases();
     runPendingTasks();
   }
 
   WebViewImpl* webViewImpl() const { return m_helper.webView(); }
 
-  FrameHost& frameHost() const {
-    return m_helper.webView()->page()->frameHost();
-  }
+  Page& page() const { return *m_helper.webView()->page(); }
+
+  FrameHost& frameHost() const { return page().frameHost(); }
 
   LocalFrame* mainFrame() const {
     return webViewImpl()->mainFrameImpl()->frame();
   }
 
   WebLocalFrame* mainWebFrame() const { return webViewImpl()->mainFrameImpl(); }
 
   FrameView* mainFrameView() const {
     return webViewImpl()->mainFrameImpl()->frame()->view();
   }
 
   VisualViewport& visualViewport() const {
     return frameHost().visualViewport();
   }
 
-  BrowserControls& browserControls() const {
-    return frameHost().browserControls();
-  }
+  BrowserControls& browserControls() const { return page().browserControls(); }
 
   Node* effectiveRootScroller(Document* doc) const {
     return &doc->rootScrollerController().effectiveRootScroller();
   }
 
   WebCoalescedInputEvent generateTouchGestureEvent(WebInputEvent::Type type,
                                                    int deltaX = 0,
                                                    int deltaY = 0) {
     return generateGestureEvent(type, WebGestureDeviceTouchscreen, deltaX,
                                 deltaY);
@@ skipping 1180 matching lines @@
   // FrameView without a layout.
   iframe->remove();
 
   EXPECT_EQ(mainFrameView()->layoutViewportScrollableArea(),
             &mainFrameView()->getRootFrameViewport()->layoutViewport());
 }
 
 }  // namespace
 
 }  // namespace blink