Removed QuadSink and MockQuadCuller

cc/test/layer_test_common.cc

 // Copyright 2012 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 "cc/test/layer_test_common.h"
 
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/fake_output_surface.h"
+#include "cc/test/mock_occlusion_tracker.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
 
 namespace cc {
 
 // Align with expected and actual output.
@@ skipping 72 matching lines @@
       EXPECT_NE(quad->rect.ToString(), quad->visible_rect.ToString());
       EXPECT_TRUE(quad->rect.Contains(quad->visible_rect));
       ++(*partially_occluded_count);
     }
   }
 }
 
 LayerTestCommon::LayerImplTest::LayerImplTest()
     : host_(FakeLayerTreeHost::Create()),
       root_layer_impl_(LayerImpl::Create(host_->host_impl()->active_tree(), 1)),
-      render_pass_(RenderPass::Create()),
-      quad_culler_(make_scoped_ptr(
-          new MockQuadCuller(render_pass_.get(), &occlusion_tracker_))) {
+      render_pass_(RenderPass::Create()) {
   scoped_ptr<FakeOutputSurface> output_surface = FakeOutputSurface::Create3d();
   host_->host_impl()->InitializeRenderer(
       output_surface.PassAs<OutputSurface>());
 }
 
 LayerTestCommon::LayerImplTest::~LayerImplTest() {}
 
 void LayerTestCommon::LayerImplTest::CalcDrawProps(
     const gfx::Size& viewport_size) {
   LayerImplList layer_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_layer_impl_.get(), viewport_size, &layer_list);
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 void LayerTestCommon::LayerImplTest::AppendQuadsWithOcclusion(
     LayerImpl* layer_impl,
     const gfx::Rect& occluded) {
   AppendQuadsData data;
 
-  quad_culler_->clear_lists();
-  quad_culler_->set_occluded_target_rect(occluded);
+  render_pass_->quad_list.clear();
+  render_pass_->shared_quad_state_list.clear();
+  occlusion_tracker_.set_occluded_target_rect(occluded);
   layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
-  layer_impl->AppendQuads(quad_culler_.get(), &data);
+  layer_impl->AppendQuads(render_pass_.get(), occlusion_tracker_, &data);
   layer_impl->DidDraw(resource_provider());
 }
 
 void LayerTestCommon::LayerImplTest::AppendQuadsForPassWithOcclusion(
     LayerImpl* layer_impl,
     const RenderPass::Id& id,
     const gfx::Rect& occluded) {
   AppendQuadsData data(id);
 
-  quad_culler_->clear_lists();
-  quad_culler_->set_occluded_target_rect(occluded);
+  render_pass_->quad_list.clear();
+  render_pass_->shared_quad_state_list.clear();
+  occlusion_tracker_.set_occluded_target_rect(occluded);
   layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
-  layer_impl->AppendQuads(quad_culler_.get(), &data);
+  layer_impl->AppendQuads(render_pass_.get(), occlusion_tracker_, &data);
   layer_impl->DidDraw(resource_provider());
 }
 
 void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion(
     RenderSurfaceImpl* surface_impl,
     const gfx::Rect& occluded) {
   AppendQuadsData data;
 
-  quad_culler_->clear_lists();
-  quad_culler_->set_occluded_target_rect_for_contributing_surface(occluded);
+  render_pass_->quad_list.clear();
+  render_pass_->shared_quad_state_list.clear();
+  occlusion_tracker_.set_occluded_target_rect_for_contributing_surface(
+      occluded);
   bool for_replica = false;
   RenderPass::Id id(1, 1);
-  surface_impl->AppendQuads(quad_culler_.get(), &data, for_replica, id);
+  surface_impl->AppendQuads(
+      render_pass_.get(), occlusion_tracker_, &data, for_replica, id);
 }
 
 }  // namespace cc