Move SharedRendererState ownership to AwContents

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 8dd6cae30b83ad56b8d5e5cd4fa6208f9d9a2235..f44839c58c6113922837a428fab14fe03f578f4f 100644
--- a/android_webview/browser/test/rendering_test.h
+++ b/android_webview/browser/test/rendering_test.h
@@ -6,6 +6,7 @@
 #define ANDROID_WEBVIEW_BROWSER_TEST_RENDERING_TEST_H_
 
 #include "android_webview/browser/browser_view_renderer_client.h"
+#include "android_webview/browser/shared_renderer_state_client.h"
 #include "android_webview/browser/test/fake_window.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -32,13 +33,12 @@ struct ParentCompositorDrawConstraints;
 
 class RenderingTest : public testing::Test,
                       public BrowserViewRendererClient,
+                      public SharedRendererStateClient,
                       public WindowHooks {
  public:
   // BrowserViewRendererClient overrides.
-  bool RequestDrawGL(bool wait_for_completion) override;
   void OnNewPicture() override;
   void PostInvalidate() override;
-  void DetachFunctorFromView() override;
   gfx::Point GetLocationOnScreen() override;
   void ScrollContainerViewTo(const gfx::Vector2d& new_value) override {}
   void UpdateScrollState(const gfx::Vector2d& max_scroll_offset,
@@ -50,6 +50,12 @@ class RenderingTest : public testing::Test,
                      const gfx::Vector2dF& overscroll_velocity) override {}
   void ParentDrawConstraintsUpdated(
       const ParentCompositorDrawConstraints& draw_constraints) override {}
+
+  // SharedRendererStateClient overrides.
+  void UpdateParentDrawConstraints() override;
+  bool RequestDrawGL(bool wait_for_completion) override;
+  void DetachFunctorFromView() override;
+
   // WindowHooks overrides.
   void WillOnDraw() override;
   void DidOnDraw(bool success) override {}
@@ -77,6 +83,7 @@ class RenderingTest : public testing::Test,
 
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
   scoped_ptr<BrowserViewRenderer> browser_view_renderer_;
+  scoped_ptr<SharedRendererState> shared_renderer_state_;

[boliu, 2016/03/30 16:12:13]

need to be above BVR like in aw_contents

[Tobias Sargeant, 2016/03/30 17:17:17]

Done.

   scoped_ptr<content::TestSynchronousCompositor> compositor_;
   scoped_ptr<FakeWindow> window_;