Test: deleting RTM before BVR does not leak resources.

android_webview/browser/test/rendering_test.h

Index: android_webview/browser/test/rendering_test.h
diff --git a/android_webview/browser/test/rendering_test.h b/android_webview/browser/test/rendering_test.h
index cafa0430d384d963b70ece0764a2a17a204740de..8fa5501fb0517fdceb15f5267996afece20a295b 100644
--- a/android_webview/browser/test/rendering_test.h
+++ b/android_webview/browser/test/rendering_test.h
@@ -12,6 +12,7 @@
 #include "android_webview/browser/test/fake_window.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
+#include "cc/resources/resource.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -32,6 +33,7 @@ class BrowserViewRenderer;
 class CompositorFrameConsumer;
 class CompositorFrameProducer;
 class FakeWindow;
+class RenderThreadManager;
 struct ParentCompositorDrawConstraints;
 
 class RenderingTest : public testing::Test,
@@ -59,13 +61,12 @@ class RenderingTest : public testing::Test,
   // WindowHooks overrides.
   void WillOnDraw() override;
   void DidOnDraw(bool success) override {}
-  void WillSyncOnRT(RenderThreadManager* functor) override {}
-  void DidSyncOnRT(RenderThreadManager* functor) override {}
-  void WillProcessOnRT(RenderThreadManager* functor) override {}
-  void DidProcessOnRT(RenderThreadManager* functor) override {}
-  bool WillDrawOnRT(RenderThreadManager* functor,
-                    AwDrawGLInfo* draw_info) override;
-  void DidDrawOnRT(RenderThreadManager* functor) override {}
+  void WillSyncOnRT() override {}
+  void DidSyncOnRT() override {}
+  void WillProcessOnRT() override {}
+  void DidProcessOnRT() override {}
+  bool WillDrawOnRT(AwDrawGLInfo* draw_info) override;
+  void DidDrawOnRT() override {}
 
   virtual void OnParentDrawConstraintsUpdated() {}
 
@@ -85,16 +86,19 @@ class RenderingTest : public testing::Test,
   void Attach();
   void EndTest();
   std::unique_ptr<cc::CompositorFrame> ConstructEmptyFrame();
-
+  std::unique_ptr<cc::CompositorFrame> ConstructFrame(
+      cc::ResourceId resource_id);
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
+  std::unique_ptr<FakeWindow> window_;
   std::unique_ptr<RenderThreadManager> render_thread_manager_;
   std::unique_ptr<BrowserViewRenderer> browser_view_renderer_;
   std::unique_ptr<content::TestSynchronousCompositor> compositor_;
-  std::unique_ptr<FakeWindow> window_;
 
  private:
   void QuitMessageLoop();
 
+  void DrawGL(AwDrawGLInfo* aw_draw_gl_info);
+
   const std::unique_ptr<base::MessageLoop> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderingTest);