Update from https://crrev.com/317530

cc/layers/scrollbar_layer_unittest.cc

Index: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index c70b93a09c1d7914854dd90b516b6fdb97520175..36c37e9d94dd91c155e98cc4818ca677dacc43ba 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -173,9 +173,10 @@ TEST_F(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
   // When the scrollbar is not an overlay scrollbar, the scroll should be
   // responded to on the main thread as the compositor does not yet implement
   // scrollbar scrolling.
-  EXPECT_EQ(InputHandler::ScrollOnMainThread,
-            scrollbar_layer_impl->TryScroll(
-                gfx::Point(0, 0), InputHandler::Gesture, ScrollBlocksOnNone));
+  EXPECT_EQ(
+      InputHandler::SCROLL_ON_MAIN_THREAD,
+      scrollbar_layer_impl->TryScroll(gfx::Point(0, 0), InputHandler::GESTURE,
+                                      SCROLL_BLOCKS_ON_NONE));
 
   // Create and attach an overlay scrollbar.
   scrollbar.reset(new FakeScrollbar(false, false, true));
@@ -187,9 +188,10 @@ TEST_F(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
 
   // The user shouldn't be able to drag an overlay scrollbar and the scroll
   // may be handled in the compositor.
-  EXPECT_EQ(InputHandler::ScrollIgnored,
-            scrollbar_layer_impl->TryScroll(
-                gfx::Point(0, 0), InputHandler::Gesture, ScrollBlocksOnNone));
+  EXPECT_EQ(
+      InputHandler::SCROLL_IGNORED,
+      scrollbar_layer_impl->TryScroll(gfx::Point(0, 0), InputHandler::GESTURE,
+                                      SCROLL_BLOCKS_ON_NONE));
 }
 
 TEST_F(ScrollbarLayerTest, ScrollOffsetSynchronization) {