Refactor BrowserViewRenderer-RenderThreadManager relationship.

android_webview/browser/test/rendering_test.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/test/rendering_test.h"
 
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/render_thread_manager.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
 #include "cc/output/compositor_frame.h"
 #include "content/public/test/test_synchronous_compositor_android.h"
 
 namespace android_webview {
 
+namespace {
+// BrowserViewRenderer subclass used for enabling tests to observe
+// OnParentDrawConstraintsUpdated.
+class BrowserViewRendererTest : public BrowserViewRenderer {

[boliu, 2016/04/21 18:14:11]

TestFoo, not FooTest. FooTest means it's the test itself.

[Tobias Sargeant, 2016/04/22 11:42:22]

Done.

+ public:
+  BrowserViewRendererTest(
+      RenderingTest* rendering_test,
+      const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
+      bool disable_page_visibility)
+      : BrowserViewRenderer(rendering_test,
+                            ui_task_runner,
+                            disable_page_visibility),
+        rendering_test_(rendering_test) {}
+
+  void OnParentDrawConstraintsUpdated() override {
+    BrowserViewRenderer::OnParentDrawConstraintsUpdated();
+    rendering_test_->OnParentDrawConstraintsUpdated();
+  }
+
+ private:
+  RenderingTest* rendering_test_;

[boliu, 2016/04/21 18:14:11]

* const

[Tobias Sargeant, 2016/04/22 11:42:22]

Done.

+};
+}
+
 RenderingTest::RenderingTest() : message_loop_(new base::MessageLoop) {
   ui_task_runner_ = base::ThreadTaskRunnerHandle::Get();
 }
 
 RenderingTest::~RenderingTest() {
   if (window_.get())
     window_->Detach();
 }
 
 void RenderingTest::SetUpTestHarness() {
   DCHECK(!browser_view_renderer_.get());
   DCHECK(!render_thread_manager_.get());
   render_thread_manager_.reset(
       new RenderThreadManager(this, base::ThreadTaskRunnerHandle::Get()));
-  browser_view_renderer_.reset(new BrowserViewRenderer(
+  browser_view_renderer_.reset(new BrowserViewRendererTest(
       this, base::ThreadTaskRunnerHandle::Get(), false));
-  browser_view_renderer_->SetRenderThreadManager(render_thread_manager_.get());
+  browser_view_renderer_->SetCompositorFrameConsumer(
+      render_thread_manager_.get());

[boliu, 2016/04/21 18:14:11]

hmm, this totally gives us the test ability to put in a fake consumer

[Tobias Sargeant, 2016/04/22 11:42:22]

Acknowledged.

   InitializeCompositor();
   Attach();
 }
 
 void RenderingTest::InitializeCompositor() {
   DCHECK(!compositor_.get());
   DCHECK(browser_view_renderer_.get());
   compositor_.reset(new content::TestSynchronousCompositor);
   compositor_->SetClient(browser_view_renderer_.get());
 }
@@ skipping 61 matching lines @@
 }
 
 void RenderingTest::OnNewPicture() {
 }
 
 void RenderingTest::PostInvalidate() {
   if (window_)
     window_->PostInvalidate();
 }
 
-void RenderingTest::OnParentDrawConstraintsUpdated() {
-  browser_view_renderer_->OnParentDrawConstraintsUpdated();
-}
-
 void RenderingTest::DetachFunctorFromView() {
 }
 
 gfx::Point RenderingTest::GetLocationOnScreen() {
   return gfx::Point();
 }
 
 }  // namespace android_webview