Make WindowAndroid a ViewAndroid

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 1681 matching lines @@
   StopObservingRootWindow();
 
   bool resize = false;
   if (content_view_core != content_view_core_) {
     overscroll_controller_.reset();
     selection_controller_.reset();
     ReleaseLocksOnSurface();
     resize = true;
     if (content_view_core_) {
       content_view_core_->RemoveObserver(this);
-      content_view_core_->GetViewAndroid()->RemoveChild(&view_);
+      view_.RemoveFromParent();
     }
     if (content_view_core) {
       content_view_core->AddObserver(this);
       content_view_core->GetViewAndroid()->AddChild(&view_);
     }
     content_view_core_ = content_view_core;
   }
 
   BrowserAccessibilityManager* manager = NULL;
   if (host_)
@@ skipping 280 matching lines @@
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
 }  // namespace content