WIP Handle AwContents needing multiple live functors.

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 8fa5501fb0517fdceb15f5267996afece20a295b..e6626e0721efb9e6dfd552ba2198b4b077bf2573 100644
--- a/android_webview/browser/test/rendering_test.h
+++ b/android_webview/browser/test/rendering_test.h
@@ -38,7 +38,6 @@ struct ParentCompositorDrawConstraints;
 
 class RenderingTest : public testing::Test,
                       public BrowserViewRendererClient,
-                      public RenderThreadManagerClient,
                       public WindowHooks {
  public:
   // BrowserViewRendererClient overrides.
@@ -54,10 +53,6 @@ class RenderingTest : public testing::Test,
   void DidOverscroll(const gfx::Vector2d& overscroll_delta,
                      const gfx::Vector2dF& overscroll_velocity) override {}
 
-  // RenderThreadManagerClient overrides.
-  bool RequestInvokeGL(bool wait_for_completion) override;
-  void DetachFunctorFromView() override;
-
   // WindowHooks overrides.
   void WillOnDraw() override;
   void DidOnDraw(bool success) override {}
@@ -70,6 +65,9 @@ class RenderingTest : public testing::Test,
 
   virtual void OnParentDrawConstraintsUpdated() {}
 
+  virtual RenderThreadManager* CreateRenderThreadManager(

[boliu, 2016/05/10 15:18:20]

return unique_ptr to imply passing ownership

[Tobias Sargeant, 2016/05/13 13:23:57]

Removed; don't need the factory any more.

+      RenderThreadManagerClient* client);
+
  protected:
 
   RenderingTest();
@@ -90,7 +88,7 @@ class RenderingTest : public testing::Test,
       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<Functor> functor_;
   std::unique_ptr<BrowserViewRenderer> browser_view_renderer_;
   std::unique_ptr<content::TestSynchronousCompositor> compositor_;