| Index: cc/layers/scrollbar_layer_unittest.cc
|
| diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
|
| index e0d7a74b9d1bd0ebbd8ccffb3d6f565133a91d58..111bae75cdd64307948cc4b519d2f35f4f34a82f 100644
|
| --- a/cc/layers/scrollbar_layer_unittest.cc
|
| +++ b/cc/layers/scrollbar_layer_unittest.cc
|
| @@ -163,7 +163,7 @@ TEST_F(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
|
| InputHandler::ScrollStatus status = scrollbar_layer_impl->TryScroll(
|
| gfx::PointF(), InputHandler::GESTURE, SCROLL_BLOCKS_ON_NONE);
|
| EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread);
|
| - EXPECT_EQ(InputHandler::SCROLL_BAR_SCROLLING,
|
| + EXPECT_EQ(MainThreadScrollingReason::kScrollbarScrolling,
|
| status.main_thread_scrolling_reasons);
|
|
|
| // Create and attach an overlay scrollbar.
|
| @@ -180,7 +180,8 @@ TEST_F(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
|
| status = scrollbar_layer_impl->TryScroll(gfx::PointF(), InputHandler::GESTURE,
|
| SCROLL_BLOCKS_ON_NONE);
|
| EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread);
|
| - EXPECT_EQ(InputHandler::NOT_SCROLLABLE, status.main_thread_scrolling_reasons);
|
| + EXPECT_EQ(MainThreadScrollingReason::kNotScrollable,
|
| + status.main_thread_scrolling_reasons);
|
| }
|
|
|
| TEST_F(ScrollbarLayerTest, ScrollOffsetSynchronization) {
|
|
|