Removed QuadSink and MockQuadCuller

cc/layers/solid_color_layer_impl_unittest.cc

Index: cc/layers/solid_color_layer_impl_unittest.cc
diff --git a/cc/layers/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc
index b01c343423ded187dac16047404855d3f363656c..e82fa5d45dba7696532a8d946c9970f5b2628f19 100644
--- a/cc/layers/solid_color_layer_impl_unittest.cc
+++ b/cc/layers/solid_color_layer_impl_unittest.cc
@@ -12,7 +12,6 @@
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/layer_test_common.h"
-#include "cc/test/mock_quad_culler.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -24,7 +23,6 @@ namespace {
 TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
   MockOcclusionTracker<LayerImpl> occlusion_tracker;
   scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-  MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
   gfx::Size layer_size = gfx::Size(800, 600);
   gfx::Rect visible_content_rect = gfx::Rect(layer_size);
@@ -41,9 +39,9 @@ TEST(SolidColorLayerImplTest, VerifyTilingCompleteAndNoOverlap) {
   layer->draw_properties().render_target = layer.get();
 
   AppendQuadsData data;
-  layer->AppendQuads(&quad_culler, &data);
+  layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
 
-  LayerTestCommon::VerifyQuadsExactlyCoverRect(quad_culler.quad_list(),
+  LayerTestCommon::VerifyQuadsExactlyCoverRect(render_pass->quad_list,
                                                visible_content_rect);
 }
 
@@ -52,7 +50,6 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
 
   MockOcclusionTracker<LayerImpl> occlusion_tracker;
   scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-  MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
   gfx::Size layer_size = gfx::Size(100, 100);
   gfx::Rect visible_content_rect = gfx::Rect(layer_size);
@@ -70,10 +67,10 @@ TEST(SolidColorLayerImplTest, VerifyCorrectBackgroundColorInQuad) {
   layer->draw_properties().render_target = layer.get();
 
   AppendQuadsData data;
-  layer->AppendQuads(&quad_culler, &data);
+  layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
 
-  ASSERT_EQ(quad_culler.quad_list().size(), 1U);
-  EXPECT_EQ(SolidColorDrawQuad::MaterialCast(quad_culler.quad_list()[0])->color,
+  ASSERT_EQ(render_pass->quad_list.size(), 1U);
+  EXPECT_EQ(SolidColorDrawQuad::MaterialCast(render_pass->quad_list[0])->color,
             test_color);
 }
 
@@ -82,7 +79,6 @@ TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
 
   MockOcclusionTracker<LayerImpl> occlusion_tracker;
   scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-  MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
   gfx::Size layer_size = gfx::Size(100, 100);
   gfx::Rect visible_content_rect = gfx::Rect(layer_size);
@@ -100,12 +96,12 @@ TEST(SolidColorLayerImplTest, VerifyCorrectOpacityInQuad) {
   layer->draw_properties().render_target = layer.get();
 
   AppendQuadsData data;
-  layer->AppendQuads(&quad_culler, &data);
+  layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
 
-  ASSERT_EQ(quad_culler.quad_list().size(), 1U);
-  EXPECT_EQ(opacity,
-            SolidColorDrawQuad::MaterialCast(quad_culler.quad_list()[0])
-                ->opacity());
+  ASSERT_EQ(render_pass->quad_list.size(), 1U);
+  EXPECT_EQ(
+      opacity,
+      SolidColorDrawQuad::MaterialCast(render_pass->quad_list[0])->opacity());
 }
 
 TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
@@ -145,14 +141,13 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
 
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
-    layer_impl->AppendQuads(&quad_culler, &data);
+    layer_impl->AppendQuads(render_pass.get(), occlusion_tracker, &data);
 
-    ASSERT_EQ(quad_culler.quad_list().size(), 1U);
+    ASSERT_EQ(render_pass->quad_list.size(), 1U);
     EXPECT_EQ(visible_content_rect.ToString(),
-              quad_culler.quad_list()[0]->opaque_rect.ToString());
+              render_pass->quad_list[0]->opaque_rect.ToString());
   }
 
   EXPECT_TRUE(layer->contents_opaque());
@@ -173,14 +168,13 @@ TEST(SolidColorLayerImplTest, VerifyOpaqueRect) {
 
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
-    layer_impl->AppendQuads(&quad_culler, &data);
+    layer_impl->AppendQuads(render_pass.get(), occlusion_tracker, &data);
 
-    ASSERT_EQ(quad_culler.quad_list().size(), 1U);
+    ASSERT_EQ(render_pass->quad_list.size(), 1U);
     EXPECT_EQ(gfx::Rect().ToString(),
-              quad_culler.quad_list()[0]->opaque_rect.ToString());
+              render_pass->quad_list[0]->opaque_rect.ToString());
   }
 }