| Index: cc/test/layer_test_common.h
|
| diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h
|
| index 6c4a9bcc48be5da229bb6d3a467fb5d8529515ea..2d85563873f22c096d2e4ee537865449022a3bec 100644
|
| --- a/cc/test/layer_test_common.h
|
| +++ b/cc/test/layer_test_common.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/quads/render_pass.h"
|
| #include "cc/test/fake_layer_tree_host.h"
|
| -#include "cc/test/mock_quad_culler.h"
|
| +#include "cc/test/mock_occlusion_tracker.h"
|
| #include "cc/trees/layer_tree_host_impl.h"
|
|
|
| #define EXPECT_SET_NEEDS_COMMIT(expect, code_to_test) \
|
| @@ -114,14 +115,13 @@ class LayerTestCommon {
|
| LayerImpl* root_layer() const { return root_layer_impl_.get(); }
|
| FakeLayerTreeHostImpl* host_impl() const { return host_->host_impl(); }
|
| Proxy* proxy() const { return host_->host_impl()->proxy(); }
|
| - const QuadList& quad_list() const { return quad_culler_->quad_list(); }
|
| + const QuadList& quad_list() const { return render_pass_->quad_list; }
|
|
|
| private:
|
| scoped_ptr<FakeLayerTreeHost> host_;
|
| scoped_ptr<LayerImpl> root_layer_impl_;
|
| scoped_ptr<RenderPass> render_pass_;
|
| MockOcclusionTracker<LayerImpl> occlusion_tracker_;
|
| - scoped_ptr<MockQuadCuller> quad_culler_;
|
| };
|
| };
|
|
|
|
|