Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / cc / layers / render_surface_unittest.cc

diff --git a/src/cc/layers/render_surface_unittest.cc b/src/cc/layers/render_surface_unittest.cc
index 62c88bc..0c1646f 100644 (file)
--- a/src/cc/layers/render_surface_unittest.cc
+++ b/src/cc/layers/render_surface_unittest.cc
@@ -11,7 +11,7 @@
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
-#include "cc/test/mock_quad_culler.h"
+#include "cc/test/mock_occlusion_tracker.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -109,12 +109,14 @@ TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectSharedQuadState) {
 
   MockOcclusionTracker<LayerImpl> occlusion_tracker;
   scoped_ptr<RenderPass> render_pass = RenderPass::Create();
-  MockQuadCuller mock_quad_culler(render_pass.get(), &occlusion_tracker);
   AppendQuadsData append_quads_data;
 
   bool for_replica = false;
-  render_surface->AppendQuads(
-      &mock_quad_culler, &append_quads_data, for_replica, RenderPass::Id(2, 0));
+  render_surface->AppendQuads(render_pass.get(),
+                              occlusion_tracker,
+                              &append_quads_data,
+                              for_replica,
+                              RenderPass::Id(2, 0));
 
   ASSERT_EQ(1u, render_pass->shared_quad_state_list.size());
   SharedQuadState* shared_quad_state = render_pass->shared_quad_state_list[0];
@@ -136,12 +138,12 @@ class TestRenderPassSink : public RenderPassSink {
     render_passes_.push_back(render_pass.Pass());
   }
 
-  const ScopedPtrVector<RenderPass>& RenderPasses() const {
+  const RenderPassList& RenderPasses() const {
     return render_passes_;
   }
 
  private:
-  ScopedPtrVector<RenderPass> render_passes_;
+  RenderPassList render_passes_;
 };
 
 TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectRenderPass) {