| Index: cc/occlusion_tracker_unittest.cc
|
| diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
|
| index 5f830ec0672f52954d1c4d606afd177e9002a66a..d779370fb99f3df60a958d22d2b814ba767f4b51 100644
|
| --- a/cc/occlusion_tracker_unittest.cc
|
| +++ b/cc/occlusion_tracker_unittest.cc
|
| @@ -407,13 +407,13 @@ private:
|
| template<>
|
| LayerTreeHost* OcclusionTrackerTest<OcclusionTrackerTestMainThreadTypes>::getHost()
|
| {
|
| - return 0;
|
| + return NULL;
|
| }
|
|
|
| template<>
|
| LayerTreeImpl* OcclusionTrackerTest<OcclusionTrackerTestImplThreadTypes>::getHost()
|
| {
|
| - return m_hostImpl.activeTree();
|
| + return m_hostImpl.active_tree();
|
| }
|
|
|
| #define RUN_TEST_MAIN_THREAD_OPAQUE_LAYERS(ClassName) \
|
|
|