Move FrameHost::m_browserControls to Page

third_party/WebKit/Source/core/frame/FrameHost.cpp

Index: third_party/WebKit/Source/core/frame/FrameHost.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameHost.cpp b/third_party/WebKit/Source/core/frame/FrameHost.cpp
index 65a1dddb2fb4dcdac940bbd774688b7693cca8bd..89f704f73e18d2add1dca1450dc1285cb7819d89 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -30,7 +30,6 @@
 
 #include "core/frame/FrameHost.h"
 
-#include "core/frame/BrowserControls.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/VisualViewport.h"
@@ -49,7 +48,6 @@ FrameHost* FrameHost::create(Page& page) {
 
 FrameHost::FrameHost(Page& page)
     : m_page(&page),
-      m_browserControls(BrowserControls::create(page)),
       m_visualViewport(VisualViewport::create(*this)),
       m_overscrollController(
           OverscrollController::create(*m_visualViewport,
@@ -72,11 +70,11 @@ const Page& FrameHost::page() const {
 }
 
 BrowserControls& FrameHost::browserControls() {
-  return *m_browserControls;
+  return m_page->browserControls();
 }
 
 const BrowserControls& FrameHost::browserControls() const {
-  return *m_browserControls;
+  return m_page->browserControls();
 }
 
 OverscrollController& FrameHost::overscrollController() {
@@ -126,7 +124,6 @@ TopDocumentRootScrollerController& FrameHost::globalRootScrollerController()
 
 DEFINE_TRACE(FrameHost) {
   visitor->trace(m_page);
-  visitor->trace(m_browserControls);
   visitor->trace(m_visualViewport);
   visitor->trace(m_overscrollController);
   visitor->trace(m_eventHandlerRegistry);