Make ViewRoot the top of the ViewAndroid tree

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
index 323781006ed24c7a9a8a9d55a05cfd984668e57a..478ff170028a6e4718b8b6b62494e9099e8371d4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.tabmodel.TabModelImpl;
 import org.chromium.chrome.browser.widget.ClipDrawableProgressBar.DrawingInfo;
 import org.chromium.ui.base.DeviceFormFactor;
+import org.chromium.ui.base.ViewRoot;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.resources.AndroidResourceType;
 import org.chromium.ui.resources.ResourceManager;
@@ -165,18 +166,18 @@ public class CompositorView
     /**
      * Initializes the {@link CompositorView}'s native parts (e.g. the rendering parts).
      * @param lowMemDevice         If this is a low memory device.
-     * @param windowAndroid        A {@link WindowAndroid} instance.
+     * @param viewRoot             A {@link ViewRoot} instance.
      * @param layerTitleCache      A {@link LayerTitleCache} instance.
      * @param tabContentManager    A {@link TabContentManager} instance.
      */
-    public void initNativeCompositor(boolean lowMemDevice, WindowAndroid windowAndroid,
+    public void initNativeCompositor(boolean lowMemDevice, ViewRoot viewRoot,
             LayerTitleCache layerTitleCache, TabContentManager tabContentManager) {
-        mWindowAndroid = windowAndroid;
+        mWindowAndroid = viewRoot.getWindowAndroid();
         mLayerTitleCache = layerTitleCache;
         mTabContentManager = tabContentManager;
 
-        mNativeCompositorView = nativeInit(lowMemDevice,
-                windowAndroid.getNativePointer(), layerTitleCache, tabContentManager);
+        mNativeCompositorView = nativeInit(
+                lowMemDevice, viewRoot.getNativePointer(), layerTitleCache, tabContentManager);
 
         assert !getHolder().getSurface().isValid()
             : "Surface created before native library loaded.";
@@ -352,7 +353,7 @@ public class CompositorView
     }
 
     // Implemented in native
-    private native long nativeInit(boolean lowMemDevice, long nativeWindowAndroid,
+    private native long nativeInit(boolean lowMemDevice, long nativeViewRoot,
             LayerTitleCache layerTitleCache, TabContentManager tabContentManager);
     private native void nativeDestroy(long nativeCompositorView);
     private native ResourceManager nativeGetResourceManager(long nativeCompositorView);