Make ViewRoot the top of the ViewAndroid tree

content/browser/android/content_view_render_view.cc

Index: content/browser/android/content_view_render_view.cc
diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc
index 177d3f60aa40d34d44d814409febce10110d32e4..319c7e896d74e97fffa371638bd048f61c0978db 100644
--- a/content/browser/android/content_view_render_view.cc
+++ b/content/browser/android/content_view_render_view.cc
@@ -36,8 +36,8 @@ bool ContentViewRenderView::RegisterContentViewRenderView(JNIEnv* env) {
 
 ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
                                              jobject obj,
-                                             gfx::NativeWindow root_window)
-    : root_window_(root_window), current_surface_format_(0) {
+                                             ui::ViewRoot* view_root)
+    : view_root_(view_root), current_surface_format_(0) {
   java_obj_.Reset(env, obj);
 }
 
@@ -47,11 +47,10 @@ ContentViewRenderView::~ContentViewRenderView() {
 // static
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
-                  jlong native_root_window) {
-  gfx::NativeWindow root_window =
-      reinterpret_cast<gfx::NativeWindow>(native_root_window);
+                  jlong native_view_root) {
+  ui::ViewRoot* view_root = reinterpret_cast<ui::ViewRoot*>(native_view_root);
   ContentViewRenderView* content_view_render_view =
-      new ContentViewRenderView(env, obj, root_window);
+      new ContentViewRenderView(env, obj, view_root);
   return reinterpret_cast<intptr_t>(content_view_render_view);
 }
 
@@ -117,7 +116,7 @@ void ContentViewRenderView::OnSwapBuffersCompleted(int pending_swap_buffers) {
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
-    compositor_.reset(Compositor::Create(this, root_window_));
+    compositor_.reset(Compositor::Create(this, view_root_));
 }
 
 }  // namespace content