Implement new compositor and ContentViewCore reparenting for VR Shell.

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index be027f541172061ac5d0a9d1764e53febe0f8cc1..4b1bdb7dae1ca2bbe796f6a93e25ac63ca060f18 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -276,19 +276,17 @@ void ContentViewCoreImpl::UpdateWindowAndroid(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
     jlong window_android) {
+  if (!window_android || view_.GetWindowAndroid()) {
+    FOR_EACH_OBSERVER(ContentViewCoreImplObserver, observer_list_,

[Ted C, 2016/09/20 19:57:07]

per my other comment, let's try to avoid this by setting it to null as part of
the VR path.

[mthiesse, 2016/09/20 20:56:08]

Done.

+                      OnDetachedFromWindow());
+    view_.RemoveFromParent();
+  }
   if (window_android) {
-    DCHECK(!view_.GetWindowAndroid());
     ui::WindowAndroid* window =
         reinterpret_cast<ui::WindowAndroid*>(window_android);
     window->AddChild(&view_);
-    FOR_EACH_OBSERVER(ContentViewCoreImplObserver,
-                      observer_list_,
+    FOR_EACH_OBSERVER(ContentViewCoreImplObserver, observer_list_,
                       OnAttachedToWindow());
-  } else {
-    FOR_EACH_OBSERVER(ContentViewCoreImplObserver,
-                      observer_list_,
-                      OnDetachedFromWindow());
-    view_.RemoveFromParent();
   }
 }