Move SharedRendererState ownership to AwContents

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 e51f3aa92fe5e482e679495c1de87958336bdb4b..e3a76986cbe9e89849d3f92ddd8f16e18a5115e3 100644
--- a/android_webview/browser/test/rendering_test.cc
+++ b/android_webview/browser/test/rendering_test.cc
@@ -8,6 +8,7 @@
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
+#include "android_webview/browser/shared_renderer_state.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/output/compositor_frame.h"
@@ -26,6 +27,9 @@ RenderingTest::~RenderingTest() {
 
 void RenderingTest::SetUpTestHarness() {
   DCHECK(!browser_view_renderer_.get());
+  DCHECK(!shared_renderer_state_.get());
+  shared_renderer_state_.reset(
+      new SharedRendererState(this, base::ThreadTaskRunnerHandle::Get()));
   browser_view_renderer_.reset(new BrowserViewRenderer(
       this, base::ThreadTaskRunnerHandle::Get(), false));
   InitializeCompositor();
@@ -40,8 +44,9 @@ void RenderingTest::InitializeCompositor() {
 }
 
 void RenderingTest::Attach() {
-  window_.reset(
-      new FakeWindow(browser_view_renderer_.get(), this, gfx::Rect(100, 100)));
+  window_.reset(new FakeWindow(browser_view_renderer_.get(),
+                               shared_renderer_state_.get(), this,
+                               gfx::Rect(100, 100)));
 }
 
 void RenderingTest::RunTest() {
@@ -110,6 +115,10 @@ void RenderingTest::PostInvalidate() {
 void RenderingTest::DetachFunctorFromView() {
 }
 
+bool RenderingTest::IsHardwareEnabled() {
+  return browser_view_renderer_->hardware_enabled();
+}
+
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }