| Index: cc/layers/layer_unittest.cc
|
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
|
| index 55f5616f93f7a5c3046126dfa6c2301beab79326..aa7e205a1a3c6e02c32c07b832e8c56aee147caa 100644
|
| --- a/cc/layers/layer_unittest.cc
|
| +++ b/cc/layers/layer_unittest.cc
|
| @@ -551,7 +551,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->SetScrollClipLayer(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)));
|
|
|