| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index 1d8289f04a55273cdd8e5bb305f7bafb14a6ded6..ccb6c7cc3a2d3b48c354467396b3cd977b88b145 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -527,7 +527,7 @@ TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) {
|
| EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset());
|
| EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
|
|
|
| - layer()->SetScrollOffsetDelegate(NULL);
|
| + layer()->SetScrollOffsetDelegate(nullptr);
|
|
|
| EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset());
|
| EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
|
| @@ -574,7 +574,7 @@ TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) {
|
| EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
|
| EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
|
|
|
| - layer()->SetScrollOffsetDelegate(NULL);
|
| + layer()->SetScrollOffsetDelegate(nullptr);
|
|
|
| EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset());
|
| EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
|
|
|