Removed QuadSink and MockQuadCuller

cc/test/layer_test_common.cc

Index: cc/test/layer_test_common.cc
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index a33160368cb60645b0011ec2876b41f1733bae86..0b2ef3ce5ec27ab3a2368661a1be13f28b3d8faa 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -10,6 +10,7 @@
 #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"
@@ -102,9 +103,7 @@ void LayerTestCommon::VerifyQuadsCoverRectWithOcclusion(
 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>());
@@ -125,10 +124,11 @@ void LayerTestCommon::LayerImplTest::AppendQuadsWithOcclusion(
     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());
 }
 
@@ -138,10 +138,11 @@ void LayerTestCommon::LayerImplTest::AppendQuadsForPassWithOcclusion(
     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());
 }
 
@@ -151,11 +152,14 @@ void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion(
     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