Removed QuadSink and MockQuadCuller

cc/layers/tiled_layer_impl_unittest.cc

Index: cc/layers/tiled_layer_impl_unittest.cc
diff --git a/cc/layers/tiled_layer_impl_unittest.cc b/cc/layers/tiled_layer_impl_unittest.cc
index 7fa7d0f7b51c1335821b5c2e54a83c410f2b1b51..a9526368463ffc076fa8ba5abe277d6f4737f170 100644
--- a/cc/layers/tiled_layer_impl_unittest.cc
+++ b/cc/layers/tiled_layer_impl_unittest.cc
@@ -10,7 +10,6 @@
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/layer_test_common.h"
-#include "cc/test/mock_quad_culler.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -76,9 +75,8 @@ class TiledLayerImplTest : public testing::Test {
     layer->SetBounds(layer_size);
 
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
-    MockQuadCuller quad_culler(render_pass, &occlusion_tracker);
     AppendQuadsData data;
-    layer->AppendQuads(&quad_culler, &data);
+    layer->AppendQuads(render_pass, occlusion_tracker, &data);
   }
 
  protected:
@@ -100,14 +98,13 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) {
         CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS);
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
     EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
-    layer->AppendQuads(&quad_culler, &data);
+    layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
     layer->DidDraw(NULL);
     unsigned num_tiles = num_tiles_x * num_tiles_y;
-    EXPECT_EQ(quad_culler.quad_list().size(), num_tiles);
+    EXPECT_EQ(render_pass->quad_list.size(), num_tiles);
   }
 
   // Layer with empty visible layer rect produces no quads
@@ -118,7 +115,6 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) {
 
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     EXPECT_FALSE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
   }
@@ -133,13 +129,12 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) {
 
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
     EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
-    layer->AppendQuads(&quad_culler, &data);
+    layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
     layer->DidDraw(NULL);
-    EXPECT_EQ(quad_culler.quad_list().size(), 0u);
+    EXPECT_EQ(render_pass->quad_list.size(), 0u);
   }
 
   // Layer with skips draw produces no quads
@@ -150,11 +145,10 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) {
 
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
-    layer->AppendQuads(&quad_culler, &data);
-    EXPECT_EQ(quad_culler.quad_list().size(), 0u);
+    layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
+    EXPECT_EQ(render_pass->quad_list.size(), 0u);
   }
 }
 
@@ -172,15 +166,14 @@ TEST_F(TiledLayerImplTest, Checkerboarding) {
   {
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
-    layer->AppendQuads(&quad_culler, &data);
-    EXPECT_EQ(quad_culler.quad_list().size(), 4u);
+    layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
+    EXPECT_EQ(render_pass->quad_list.size(), 4u);
     EXPECT_EQ(0u, data.num_missing_tiles);
 
-    for (size_t i = 0; i < quad_culler.quad_list().size(); ++i)
-      EXPECT_EQ(quad_culler.quad_list()[i]->material, DrawQuad::TILED_CONTENT);
+    for (size_t i = 0; i < render_pass->quad_list.size(); ++i)
+      EXPECT_EQ(render_pass->quad_list[i]->material, DrawQuad::TILED_CONTENT);
   }
 
   for (int i = 0; i < num_tiles_x; ++i)
@@ -191,14 +184,13 @@ TEST_F(TiledLayerImplTest, Checkerboarding) {
   {
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
-    layer->AppendQuads(&quad_culler, &data);
+    layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
     EXPECT_LT(0u, data.num_missing_tiles);
-    EXPECT_EQ(quad_culler.quad_list().size(), 4u);
-    for (size_t i = 0; i < quad_culler.quad_list().size(); ++i)
-      EXPECT_NE(quad_culler.quad_list()[i]->material, DrawQuad::TILED_CONTENT);
+    EXPECT_EQ(render_pass->quad_list.size(), 4u);
+    for (size_t i = 0; i < render_pass->quad_list.size(); ++i)
+      EXPECT_NE(render_pass->quad_list[i]->material, DrawQuad::TILED_CONTENT);
   }
 }