Test: deleting RTM before BVR does not leak resources.

android_webview/browser/test/fake_window.h

Index: android_webview/browser/test/fake_window.h
diff --git a/android_webview/browser/test/fake_window.h b/android_webview/browser/test/fake_window.h
index 96e45a06d0a3e4c2de1c11e93913892cfa0363c9..d4f64a240f79a8f90283efd31f514e8ad6e3f5bc 100644
--- a/android_webview/browser/test/fake_window.h
+++ b/android_webview/browser/test/fake_window.h
@@ -24,7 +24,6 @@ class WaitableEvent;
 namespace android_webview {
 
 class BrowserViewRenderer;
-class RenderThreadManager;
 
 class WindowHooks {
  public:
@@ -33,19 +32,20 @@ class WindowHooks {
   virtual void WillOnDraw() = 0;
   virtual void DidOnDraw(bool success) = 0;
 
-  virtual void WillSyncOnRT(RenderThreadManager* functor) = 0;
-  virtual void DidSyncOnRT(RenderThreadManager* functor) = 0;
-  virtual void WillProcessOnRT(RenderThreadManager* functor) = 0;
-  virtual void DidProcessOnRT(RenderThreadManager* functor) = 0;
-  virtual bool WillDrawOnRT(RenderThreadManager* functor,
-                            AwDrawGLInfo* draw_info) = 0;
-  virtual void DidDrawOnRT(RenderThreadManager* functor) = 0;
+  virtual void WillSyncOnRT() = 0;
+  virtual void DidSyncOnRT() = 0;
+  virtual void WillProcessOnRT() = 0;
+  virtual void DidProcessOnRT() = 0;
+  virtual bool WillDrawOnRT(AwDrawGLInfo* draw_info) = 0;
+  virtual void DidDrawOnRT() = 0;
 };
 
 class FakeWindow {
  public:
+  typedef base::Callback<void(AwDrawGLInfo*)> DrawGLCallback;

[boliu, 2016/04/25 19:56:54]

c++11 style is preferred now I think, using foo = bar;

[Tobias Sargeant, 2016/04/26 15:29:52]

Done. I didn't know that this existed. Thanks for pointing it out.

+
   FakeWindow(BrowserViewRenderer* view,
-             RenderThreadManager* functor,
+             const base::Callback<void(AwDrawGLInfo*)> draw_gl,
              WindowHooks* hooks,
              gfx::Rect location);
   ~FakeWindow();
@@ -83,7 +83,7 @@ class FakeWindow {
   // Render thread members.
   std::unique_ptr<base::Thread> render_thread_;
   base::SequenceChecker rt_checker_;
-  RenderThreadManager* functor_;
+  DrawGLCallback draw_gl_;
   scoped_refptr<base::SingleThreadTaskRunner> render_thread_loop_;
   scoped_refptr<gfx::GLSurface> surface_;
   scoped_refptr<gfx::GLContext> context_;