Make ViewRoot the top of the ViewAndroid tree

content/public/browser/android/compositor.h

Index: content/public/browser/android/compositor.h
diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h
index be022bc50498cf7faed970b281280fb86e3ddf1a..1f34ca955a1b1406d30d0405bfeaf555b87c65d2 100644
--- a/content/public/browser/android/compositor.h
+++ b/content/public/browser/android/compositor.h
@@ -5,13 +5,14 @@
 #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_H_
 #define CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_H_
 
+#include <jni.h>
+
 #include "base/callback.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "content/common/content_export.h"
 #include "ui/android/resources/ui_resource_provider.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class Layer;
@@ -20,6 +21,7 @@ class Layer;
 namespace ui {
 class ResourceManager;
 class UIResourceProvider;
+class ViewRoot;
 }
 
 namespace content {
@@ -34,10 +36,9 @@ class CONTENT_EXPORT Compositor {
   // instance can be used. This should be called only once.
   static void Initialize();
 
-  // Creates and returns a compositor instance.  |root_window| needs to outlive
+  // Creates and returns a compositor instance.  |view_root| needs to outlive
   // the compositor as it manages callbacks on the compositor.
-  static Compositor* Create(CompositorClient* client,
-                            gfx::NativeWindow root_window);
+  static Compositor* Create(CompositorClient* client, ui::ViewRoot* view_root);
 
   // Attaches the layer tree.
   virtual void SetRootLayer(scoped_refptr<cc::Layer> root) = 0;