Test: deleting RTM before BVR does not leak resources.

android_webview/browser/test/rendering_test.cc

Index: android_webview/browser/test/rendering_test.cc
diff --git a/android_webview/browser/test/rendering_test.cc b/android_webview/browser/test/rendering_test.cc
index 5c203272205aa4901fe4761ef6575f02e3f4f2ca..bb20f8050a62aa41aacf1b1807e35d4a6a13d6c3 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -30,6 +30,8 @@ class TestBrowserViewRenderer : public BrowserViewRenderer {
                             disable_page_visibility),
         rendering_test_(rendering_test) {}
 
+  ~TestBrowserViewRenderer() {}
+
   void OnParentDrawConstraintsUpdated() override {
     BrowserViewRenderer::OnParentDrawConstraintsUpdated();
     rendering_test_->OnParentDrawConstraintsUpdated();
@@ -45,6 +47,7 @@ RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) {
 }
 
 RenderingTest::~RenderingTest() {
+  DCHECK(ui_task_runner_->BelongsToCurrentThread());
   if (window_.get())
     window_->Detach();
 }
@@ -77,10 +80,15 @@ void RenderingTest::InitializeCompositor() {
   compositor_->SetClient(browser_view_renderer_.get());
 }
 
+void RenderingTest::DrawGL(AwDrawGLInfo* aw_draw_gl_info) {
+  render_thread_manager_->DrawGL(aw_draw_gl_info);
+}
+
 void RenderingTest::Attach() {
-  window_.reset(new FakeWindow(browser_view_renderer_.get(),
-                               render_thread_manager_.get(), this,
-                               gfx::Rect(100, 100)));
+  window_.reset(
+      new FakeWindow(browser_view_renderer_.get(),
+                     base::Bind(&RenderingTest::DrawGL, base::Unretained(this)),
+                     this, gfx::Rect(100, 100)));
 }
 
 void RenderingTest::RunTest() {
@@ -129,8 +137,7 @@ bool RenderingTest::RequestInvokeGL(bool wait_for_completion) {
   return true;
 }
 
-bool RenderingTest::WillDrawOnRT(RenderThreadManager* functor,
-                                 AwDrawGLInfo* draw_info) {
+bool RenderingTest::WillDrawOnRT(AwDrawGLInfo* draw_info) {
   draw_info->width = window_->surface_size().width();
   draw_info->height = window_->surface_size().height();
   draw_info->is_layer = false;