Rename classes related to top controls

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index ee2e21e3a83ad9429a9d891c78adca0ebe79e373..8392a594f6a7d7af08516efa6ad6c7ad4a431504 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -24,7 +24,7 @@
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
-#include "cc/input/top_controls_state.h"
+#include "cc/input/browser_controls_state.h"
 #include "cc/resources/shared_bitmap.h"
 #include "content/common/content_export.h"
 #include "content/common/drag_event_source_info.h"
@@ -32,11 +32,11 @@
 #include "content/common/navigation_gesture.h"
 #include "content/common/page_message_enums.h"
 #include "content/common/view_message_enums.h"
+#include "content/public/common/browser_controls_state.h"
 #include "content/public/common/drop_data.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/renderer_preferences.h"
-#include "content/public/common/top_controls_state.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/render_view.h"
 #include "content/renderer/render_frame_impl.h"
@@ -406,8 +406,8 @@ class CONTENT_EXPORT RenderViewImpl
   void ClearEditCommands() override;
   const std::string& GetAcceptLanguages() const override;
 #if defined(OS_ANDROID)
-  void UpdateTopControlsState(TopControlsState constraints,
-                              TopControlsState current,
+  void UpdateTopControlsState(BrowserControlsState constraints,
+                              BrowserControlsState current,
                               bool animate) override;
 #endif
   void ConvertViewportToWindowViaWidget(blink::WebRect* rect) override;
@@ -801,7 +801,7 @@ class CONTENT_EXPORT RenderViewImpl
 #if defined(OS_ANDROID)
   // Cache the old top controls state constraints. Used when updating
   // current value only without altering the constraints.
-  TopControlsState top_controls_constraints_;
+  BrowserControlsState top_controls_constraints_;

[vmpstr, 2016/10/21 17:54:59]

browser_controls_constraints_?

 #endif
 
   // Whether or not Blink's viewport size should be shrunk by the height of the