Removed QuadSink and MockQuadCuller

cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc

 // Copyright 2013 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/layers/append_quads_data.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/test/layer_tree_pixel_test.h"
-#include "cc/test/mock_quad_culler.h"
+#include "cc/test/mock_occlusion_tracker.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 
 #if !defined(OS_ANDROID)
 
 namespace cc {
 namespace {
@@ skipping 14 matching lines @@
   virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
                                    bool result) OVERRIDE {
     // Find the PictureLayerImpl ask it to append quads to check their material.
     // The PictureLayerImpl is assumed to be the first child of the root layer
     // in the active tree.
     PictureLayerImpl* picture_layer = static_cast<PictureLayerImpl*>(
         host_impl->active_tree()->root_layer()->child_at(0));
 
     MockOcclusionTracker<LayerImpl> occlusion_tracker;
     scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-    MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
 
     AppendQuadsData data;
-    picture_layer->AppendQuads(&quad_culler, &data);
+    picture_layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
 
     for (size_t i = 0; i < render_pass->quad_list.size(); ++i)
       EXPECT_EQ(render_pass->quad_list[i]->material, DrawQuad::PICTURE_CONTENT);
 
     // Triggers pixel readback and ends the test.
     LayerTreePixelTest::SwapBuffersOnThread(host_impl, result);
   }
 
   void RunOnDemandRasterPixelTest();
 };
@@ skipping 63 matching lines @@
 
 TEST_F(LayerTreeHostOnDemandRasterPixelTestWithGpuRasterizationForced,
        RasterPictureLayer) {
   RunOnDemandRasterPixelTest();
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // OS_ANDROID