Refactor BrowserViewRenderer-RenderThreadManager relationship.

android_webview/browser/browser_view_renderer_unittest.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 <map>
 #include <queue>
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
+#include "android_webview/browser/compositor_frame_consumer.h"
 #include "android_webview/browser/test/rendering_test.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/output/compositor_frame.h"
 #include "content/public/test/test_synchronous_compositor_android.h"
 
 namespace android_webview {
 
 class SmokeTest : public RenderingTest {
   void StartTest() override { browser_view_renderer_->PostInvalidate(); }
@@ skipping 96 matching lines @@
       const ParentCompositorDrawConstraints& constraints2) {
     if (constraints1.is_layer != constraints2.is_layer ||
         constraints1.transform != constraints2.transform)
       return false;
 
     return !constraints1.is_layer ||
            constraints1.surface_rect_empty == constraints2.surface_rect_empty;
   }
 
   void OnParentDrawConstraintsUpdated() override {
-    RenderingTest::OnParentDrawConstraintsUpdated();
     ParentCompositorDrawConstraints constraints =
-        render_thread_manager_->GetParentDrawConstraintsOnUI();
+        GetCompositorFrameConsumer()->GetParentDrawConstraintsOnUI();
     switch (on_draw_count_) {
       case 1u:
         EXPECT_TRUE(DrawConstraintsEquals(constraints, new_constraints_));
         break;
       case 3u:
         EXPECT_TRUE(DrawConstraintsEquals(constraints, initial_constraints_));
         EndTest();
         break;
       // There will be a following 4th onDraw. But the hardware renderer won't
       // post back the draw constraints in DrawGL because the constraints
@@ skipping 139 matching lines @@
 
  private:
   std::queue<content::SynchronousCompositor::Frame> frames_;
   uint32_t last_output_surface_id_;
   std::map<cc::ResourceId, int> expected_return_count_;
 };
 
 RENDERING_TEST_F(SwitchOutputSurfaceIdTest);
 
 }  // namespace android_webview