Rename classes related to top controls

content/renderer/gpu/render_widget_compositor.cc

Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 6916fcf43b4ff7777a5e3ee82a0f9cea1a23dd33..5ac4c1b6dab16960e9b230abb3450887a4706189 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -79,7 +79,7 @@ using blink::WebFloatPoint;
 using blink::WebRect;
 using blink::WebSelection;
 using blink::WebSize;
-using blink::WebTopControlsState;
+using blink::WebBrowserControlsState;
 
 namespace content {
 namespace {
@@ -190,18 +190,18 @@ gfx::Size CalculateDefaultTileSize(float initial_device_scale_factor) {
   return gfx::Size(default_tile_size, default_tile_size);
 }
 
-// Check cc::TopControlsState, and blink::WebTopControlsState
+// Check cc::BrowserControlsState, and blink::WebBrowserControlsState
 // are kept in sync.
-static_assert(int(blink::WebTopControlsBoth) == int(cc::BOTH),
+static_assert(int(blink::WebBrowserControlsBoth) == int(cc::BOTH),
               "mismatching enums: BOTH");
-static_assert(int(blink::WebTopControlsHidden) == int(cc::HIDDEN),
+static_assert(int(blink::WebBrowserControlsHidden) == int(cc::HIDDEN),
               "mismatching enums: HIDDEN");
-static_assert(int(blink::WebTopControlsShown) == int(cc::SHOWN),
+static_assert(int(blink::WebBrowserControlsShown) == int(cc::SHOWN),
               "mismatching enums: SHOWN");
 
-static cc::TopControlsState ConvertTopControlsState(
-    WebTopControlsState state) {
-  return static_cast<cc::TopControlsState>(state);
+static cc::BrowserControlsState ConvertBrowserControlsState(
+    WebBrowserControlsState state) {
+  return static_cast<cc::BrowserControlsState>(state);
 }
 
 }  // namespace
@@ -335,7 +335,7 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
       compositor_deps->AreImageDecodeTasksEnabled();
 
   // Build LayerTreeSettings from command line args.
-  LayerTreeSettingsFactory::SetTopControlsSettings(settings, cmd);
+  LayerTreeSettingsFactory::SetBrowserControlsSettings(settings, cmd);
 
   settings.use_layer_lists = cmd.HasSwitch(cc::switches::kEnableLayerLists);
 
@@ -965,21 +965,22 @@ void RenderWidgetCompositor::setShowScrollBottleneckRects(bool show) {
   layer_tree_host_->SetDebugState(debug_state);
 }
 
-void RenderWidgetCompositor::updateTopControlsState(
-    WebTopControlsState constraints,
-    WebTopControlsState current,
+void RenderWidgetCompositor::updateBrowserControlsState(
+    WebBrowserControlsState constraints,
+    WebBrowserControlsState current,
     bool animate) {
-  layer_tree_host_->UpdateTopControlsState(ConvertTopControlsState(constraints),
-                                           ConvertTopControlsState(current),
-                                           animate);
+  layer_tree_host_->UpdateBrowserControlsState(
+      ConvertBrowserControlsState(constraints),
+      ConvertBrowserControlsState(current), animate);
 }
 
-void RenderWidgetCompositor::setTopControlsHeight(float height, bool shrink) {
-  layer_tree_host_->GetLayerTree()->SetTopControlsHeight(height, shrink);
+void RenderWidgetCompositor::setBrowserControlsHeight(float height,
+                                                      bool shrink) {
+  layer_tree_host_->GetLayerTree()->SetBrowserControlsHeight(height, shrink);
 }
 
-void RenderWidgetCompositor::setTopControlsShownRatio(float ratio) {
-  layer_tree_host_->GetLayerTree()->SetTopControlsShownRatio(ratio);
+void RenderWidgetCompositor::setBrowserControlsShownRatio(float ratio) {
+  layer_tree_host_->GetLayerTree()->SetBrowserControlsShownRatio(ratio);
 }
 
 void RenderWidgetCompositor::setBottomControlsHeight(float height) {