[Android] Rename TabBase to Tab

chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabUtils.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabUtils.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabBaseTabUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabUtils.java
similarity index 90%
rename from chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabBaseTabUtils.java
rename to chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabUtils.java
index abc74c6390996cd2e61037952de177c5c4650212..9aefe9baae768a67ae47d29f3e5e8468bd233a69 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabBaseTabUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/TabUtils.java
@@ -7,7 +7,7 @@ package org.chromium.chrome.test.util;
 import android.view.ContextMenu;
 
 import org.chromium.chrome.browser.EmptyTabObserver;
-import org.chromium.chrome.browser.TabBase;
+import org.chromium.chrome.browser.Tab;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
@@ -20,8 +20,8 @@ import java.lang.ref.WeakReference;
 /**
  * A utility class that contains methods generic to all Tabs tests.
  */
-public class TabBaseTabUtils {
-    private static TestContentViewClient createTestContentViewClientForTab(TabBase tab) {
+public class TabUtils {
+    private static TestContentViewClient createTestContentViewClientForTab(Tab tab) {
         ContentViewClient client = tab.getContentView().getContentViewClient();
         if (client instanceof TestContentViewClient) return (TestContentViewClient) client;
 
@@ -34,19 +34,19 @@ public class TabBaseTabUtils {
         private final OnCloseTabHelper mOnCloseTabHelper;
         private final OnContextMenuShownHelper mOnContextMenuShownHelper;
 
-        public TestCallbackHelperContainerForTab(TabBase tab) {
+        public TestCallbackHelperContainerForTab(Tab tab) {
             super(createTestContentViewClientForTab(tab),
                     new TestWebContentsObserver(tab.getContentView().getContentViewCore()));
             mOnCloseTabHelper = new OnCloseTabHelper();
             mOnContextMenuShownHelper = new OnContextMenuShownHelper();
             tab.addObserver(new EmptyTabObserver() {
                 @Override
-                public void onDestroyed(TabBase tab) {
+                public void onDestroyed(Tab tab) {
                     mOnCloseTabHelper.notifyCalled();
                 }
 
                 @Override
-                public void onContextMenuShown(TabBase tab, ContextMenu menu) {
+                public void onContextMenuShown(Tab tab, ContextMenu menu) {
                     mOnContextMenuShownHelper.notifyCalled(menu);
                 }
             });
@@ -81,7 +81,7 @@ public class TabBaseTabUtils {
     /**
      * Creates, binds and returns a TestCallbackHelperContainer for a given Tab.
      */
-    public static TestCallbackHelperContainerForTab getTestCallbackHelperContainer(TabBase tab) {
+    public static TestCallbackHelperContainerForTab getTestCallbackHelperContainer(Tab tab) {
         return tab == null ? null : new TestCallbackHelperContainerForTab(tab);
     }
 }