Make ViewRoot the top of the ViewAndroid tree

chrome/browser/android/compositor/compositor_view.cc

Index: chrome/browser/android/compositor/compositor_view.cc
diff --git a/chrome/browser/android/compositor/compositor_view.cc b/chrome/browser/android/compositor/compositor_view.cc
index a13ec780730a4f15390e69ce5930e183f09092ed..b651b6b90ba3fcf704b6795417ee2bf7955b11ec 100644
--- a/chrome/browser/android/compositor/compositor_view.cc
+++ b/chrome/browser/android/compositor/compositor_view.cc
@@ -44,12 +44,11 @@ namespace android {
 jlong Init(JNIEnv* env,
            const JavaParamRef<jobject>& obj,
            jboolean low_mem_device,
-           jlong native_window_android,
+           jlong native_view_root,
            const JavaParamRef<jobject>& jlayer_title_cache,
            const JavaParamRef<jobject>& jtab_content_manager) {
   CompositorView* view;
-  ui::WindowAndroid* window_android =
-      reinterpret_cast<ui::WindowAndroid*>(native_window_android);
+  ui::ViewRoot* view_root = reinterpret_cast<ui::ViewRoot*>(native_view_root);
   LayerTitleCache* layer_title_cache =
       LayerTitleCache::FromJavaObject(jlayer_title_cache);
   TabContentManager* tab_content_manager =
@@ -58,7 +57,7 @@ jlong Init(JNIEnv* env,
   DCHECK(tab_content_manager);
 
   // TODO(clholgat): Remove the compositor tabstrip flag.
-  view = new CompositorView(env, obj, low_mem_device, window_android,
+  view = new CompositorView(env, obj, low_mem_device, view_root,
                             tab_content_manager);
 
   ui::UIResourceProvider* ui_resource_provider = view->GetUIResourceProvider();
@@ -75,7 +74,7 @@ jlong Init(JNIEnv* env,
 CompositorView::CompositorView(JNIEnv* env,
                                jobject obj,
                                jboolean low_mem_device,
-                               ui::WindowAndroid* window_android,
+                               ui::ViewRoot* view_root,
                                TabContentManager* tab_content_manager)
     : tab_content_manager_(tab_content_manager),
       root_layer_(cc::SolidColorLayer::Create()),
@@ -87,7 +86,7 @@ CompositorView::CompositorView(JNIEnv* env,
       weak_factory_(this) {
   content::BrowserChildProcessObserver::Add(this);
   obj_.Reset(env, obj);
-  compositor_.reset(content::Compositor::Create(this, window_android));
+  compositor_.reset(content::Compositor::Create(this, view_root));
 
   root_layer_->SetIsDrawable(true);
   root_layer_->SetBackgroundColor(SK_ColorWHITE);