Make ViewRoot the top of the ViewAndroid tree

chrome/browser/android/vr_shell/vr_shell.cc

Index: chrome/browser/android/vr_shell/vr_shell.cc
diff --git a/chrome/browser/android/vr_shell/vr_shell.cc b/chrome/browser/android/vr_shell/vr_shell.cc
index d77ea0bc040bed3e4a4c0d53920e6f198d74578f..f85d9e49f39f0168f34bf04bfe3692964ea6dd91 100644
--- a/chrome/browser/android/vr_shell/vr_shell.cc
+++ b/chrome/browser/android/vr_shell/vr_shell.cc
@@ -64,9 +64,9 @@ void SetIsInVR(content::WebContents* contents, bool is_in_vr) {
 VrShell::VrShell(JNIEnv* env,
                  jobject obj,
                  content::WebContents* main_contents,
-                 ui::WindowAndroid* content_window,
+                 ui::ViewRoot* content_view_root,
                  content::WebContents* ui_contents,
-                 ui::WindowAndroid* ui_window,
+                 ui::ViewRoot* ui_view_root,
                  bool for_web_vr,
                  VrShellDelegate* delegate,
                  gvr_context* gvr_api,
@@ -74,9 +74,9 @@ VrShell::VrShell(JNIEnv* env,
     : WebContentsObserver(ui_contents),
       main_contents_(main_contents),
       content_compositor_(
-          base::MakeUnique<VrCompositor>(content_window, false)),
+          base::MakeUnique<VrCompositor>(content_view_root, false)),
       ui_contents_(ui_contents),
-      ui_compositor_(base::MakeUnique<VrCompositor>(ui_window, true)),
+      ui_compositor_(base::MakeUnique<VrCompositor>(ui_view_root, true)),
       delegate_provider_(delegate),
       metrics_helper_(base::MakeUnique<VrMetricsHelper>(main_contents_)),
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
@@ -595,19 +595,22 @@ device::mojom::VRDisplayInfoPtr VrShell::CreateVRDisplayInfo(
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
-jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj,
+jlong Init(JNIEnv* env,
+           const JavaParamRef<jobject>& obj,
            const JavaParamRef<jobject>& content_web_contents,
-           jlong content_window_android,
+           jlong content_view_root,
            const JavaParamRef<jobject>& ui_web_contents,
-           jlong ui_window_android, jboolean for_web_vr,
+           jlong ui_view_root,
+           jboolean for_web_vr,
            const base::android::JavaParamRef<jobject>& delegate,
-           jlong gvr_api, jboolean reprojected_rendering) {
+           jlong gvr_api,
+           jboolean reprojected_rendering) {
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, content::WebContents::FromJavaWebContents(content_web_contents),
-      reinterpret_cast<ui::WindowAndroid*>(content_window_android),
+      reinterpret_cast<ui::ViewRoot*>(content_view_root),
       content::WebContents::FromJavaWebContents(ui_web_contents),
-      reinterpret_cast<ui::WindowAndroid*>(ui_window_android),
-      for_web_vr, VrShellDelegate::GetNativeVrShellDelegate(env, delegate),
+      reinterpret_cast<ui::ViewRoot*>(ui_view_root), for_web_vr,
+      VrShellDelegate::GetNativeVrShellDelegate(env, delegate),
       reinterpret_cast<gvr_context*>(gvr_api), reprojected_rendering));
 }