Rename classes related to top controls

content/public/renderer/render_view.h

Index: content/public/renderer/render_view.h
diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h
index 80c01ef56e9321c2a10ff46089de4a55569a1afe..a5d951d08e10fee8785a44a3b5d8d6eb611ffe57 100644
--- a/content/public/renderer/render_view.h
+++ b/content/public/renderer/render_view.h
@@ -12,7 +12,7 @@
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
-#include "content/public/common/top_controls_state.h"
+#include "content/public/common/browser_controls_state.h"
 #include "ipc/ipc_sender.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/native_widget_types.h"
@@ -119,8 +119,8 @@ class CONTENT_EXPORT RenderView : public IPC::Sender {
   virtual const std::string& GetAcceptLanguages() const = 0;
 
 #if defined(OS_ANDROID)
-  virtual void UpdateTopControlsState(TopControlsState constraints,
-                                      TopControlsState current,
+  virtual void UpdateTopControlsState(BrowserControlsState constraints,
+                                      BrowserControlsState current,
                                       bool animate) = 0;
 #endif