Make ViewRoot the top of the ViewAndroid tree

content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
index 77211351fab7e2da8043bee0dc454cdc914814e5..231593a8100d79fb45fee2fa8183a3f164fb5f72 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
@@ -15,7 +15,7 @@ import android.widget.FrameLayout;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content_public.browser.WebContents;
-import org.chromium.ui.base.WindowAndroid;
+import org.chromium.ui.base.ViewRoot;
 
 /***
  * This view is used by a ContentView to render its content.
@@ -56,13 +56,13 @@ public class ContentViewRenderView extends FrameLayout {
     /**
      * Initialization that requires native libraries should be done here.
      * Native code should add/remove the layers to be rendered through the ContentViewLayerRenderer.
-     * @param rootWindow The {@link WindowAndroid} this render view should be linked to.
+     * @param viewRoot The {@link ViewRoot} this render view should be linked to.
      */
-    public void onNativeLibraryLoaded(WindowAndroid rootWindow) {
+    public void onNativeLibraryLoaded(ViewRoot viewRoot) {
         assert !mSurfaceView.getHolder().getSurface().isValid() :
                 "Surface created before native library loaded.";
-        assert rootWindow != null;
-        mNativeContentViewRenderView = nativeInit(rootWindow.getNativePointer());
+        assert viewRoot != null;
+        mNativeContentViewRenderView = nativeInit(viewRoot.getNativePointer());
         assert mNativeContentViewRenderView != 0;
         mSurfaceCallback = new SurfaceHolder.Callback() {
             @Override
@@ -181,7 +181,7 @@ public class ContentViewRenderView extends FrameLayout {
         }
     }
 
-    private native long nativeInit(long rootWindowNativePointer);
+    private native long nativeInit(long viewRootNativePointer);
     private native void nativeDestroy(long nativeContentViewRenderView);
     private native void nativeSetCurrentWebContents(
             long nativeContentViewRenderView, WebContents webContents);