| Index: cc/layers/layer_unittest.cc
|
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
|
| index 0414acb26fffaf792d8703b29f4512d5cc73c7c4..3eaa4823a31896a7dc5c74a9564c80756c3c7d14 100644
|
| --- a/cc/layers/layer_unittest.cc
|
| +++ b/cc/layers/layer_unittest.cc
|
| @@ -549,7 +549,8 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
|
| EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetPosition(gfx::PointF(4.f, 9.f)));
|
| EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetSublayerTransform(
|
| gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)));
|
| - EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollable(true));
|
| + // We can use any layer pointer here since we aren't syncing for real.
|
| + EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollable(test_layer.get()));
|
| EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetUserScrollable(true, false));
|
| EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollOffset(
|
| gfx::Vector2d(10, 10)));
|
|
|