Rename classes related to top controls

chrome/browser/android/tab_android.cc

Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index e0ecd6f0265b9a8a5f9d917a213b8f75fde1d94b..0d5ff1934de1f8e15b7747dda8598d778e8271d6 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -81,8 +81,8 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/browser_controls_state.h"
 #include "content/public/common/resource_request_body.h"
-#include "content/public/common/top_controls_state.h"
 #include "jni/Tab_jni.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
@@ -746,23 +746,23 @@ void TabAndroid::CreateHistoricalTab(JNIEnv* env,
   TabAndroid::CreateHistoricalTabFromContents(web_contents());
 }
 
-void TabAndroid::UpdateTopControlsState(JNIEnv* env,
-                                        const JavaParamRef<jobject>& obj,
-                                        jint constraints,
-                                        jint current,
-                                        jboolean animate) {
-  content::TopControlsState constraints_state =
-      static_cast<content::TopControlsState>(constraints);
-  content::TopControlsState current_state =
-      static_cast<content::TopControlsState>(current);
+void TabAndroid::UpdateBrowserControlsState(JNIEnv* env,
+                                            const JavaParamRef<jobject>& obj,
+                                            jint constraints,
+                                            jint current,
+                                            jboolean animate) {
+  content::BrowserControlsState constraints_state =
+      static_cast<content::BrowserControlsState>(constraints);
+  content::BrowserControlsState current_state =
+      static_cast<content::BrowserControlsState>(current);
   WebContents* sender = web_contents();
-  sender->Send(new ChromeViewMsg_UpdateTopControlsState(
+  sender->Send(new ChromeViewMsg_UpdateBrowserControlsState(
       sender->GetRoutingID(), constraints_state, current_state, animate));
 
   if (sender->ShowingInterstitialPage()) {
     content::RenderViewHost* interstitial_view_host =
         sender->GetInterstitialPage()->GetMainFrame()->GetRenderViewHost();
-    interstitial_view_host->Send(new ChromeViewMsg_UpdateTopControlsState(
+    interstitial_view_host->Send(new ChromeViewMsg_UpdateBrowserControlsState(
         interstitial_view_host->GetRoutingID(), constraints_state,
         current_state, animate));
   }