Remove all external references to ContentView from Tab/Shell/etc.

chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
index b48a5bd657f56e3aba6ad9d76ed7c1f3d7bddb5d..71b2b48388e5f515b55d0c88d9cc48ce31b74ed3 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
@@ -14,7 +14,6 @@ import android.widget.LinearLayout;
 import org.chromium.chrome.browser.EmptyTabObserver;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.content.browser.ContentVideoViewClient;
-import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.ui.base.WindowAndroid;
@@ -36,7 +35,7 @@ public class TabManager extends LinearLayout {
     private ChromeShellTab mCurrentTab;
 
     private String mStartupUrl = DEFAULT_URL;
-    private ContentView mCurrentContentView;
+    private View mCurrentView;
 
     /**
      * @param context The Context the view is running in.
@@ -121,17 +120,17 @@ public class TabManager extends LinearLayout {
 
     private void setCurrentTab(ChromeShellTab tab) {
         if (mCurrentTab != null) {
-            mContentViewHolder.removeView(mCurrentTab.getContentView());
+            mContentViewHolder.removeView(mCurrentTab.getView());
             mCurrentTab.destroy();
         }
 
         mCurrentTab = tab;
-        mCurrentContentView = tab.getContentView();
+        mCurrentView = tab.getView();
 
         mCurrentTab.addObserver(new EmptyTabObserver() {
             @Override
             public void onContentChanged(Tab tab) {
-                mContentViewHolder.removeView(mCurrentContentView);
+                mContentViewHolder.removeView(mCurrentView);
                 setupContent(tab);
             }
         });
@@ -141,9 +140,9 @@ public class TabManager extends LinearLayout {
     }
 
     private void setupContent(Tab tab) {
-        mContentViewHolder.addView(tab.getContentView());
+        mContentViewHolder.addView(tab.getView());
         mContentViewRenderView.setCurrentContentViewCore(tab.getContentViewCore());
-        tab.getContentView().requestFocus();
+        tab.getView().requestFocus();
         tab.getContentViewCore().onShow();
     }
 }