Track the currently scrolling ScrollNode instead of the scrolling layer

cc/trees/layer_tree_host_unittest_scroll.cc

Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 9f545a5fe208f297f4241bb309b34a30ef4ab344..8cd4edf131a24d75a429b2ca10dd5fa91344b5c8 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -697,12 +697,12 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
             BeginState(scroll_point).get(), InputHandler::TOUCHSCREEN);
         EXPECT_EQ(InputHandler::SCROLL_ON_IMPL_THREAD, status.thread);
         impl->ScrollBy(UpdateState(gfx::Point(), scroll_amount_).get());
-        LayerImpl* scrolling_layer = impl->CurrentlyScrollingLayer();
-        CHECK(scrolling_layer);
+        auto* scrolling_node = impl->CurrentlyScrollingNode();
+        CHECK(scrolling_node);
         impl->ScrollEnd(EndState().get());
-        CHECK(!impl->CurrentlyScrollingLayer());
-        EXPECT_EQ(scrolling_layer->id(),
-                  impl->active_tree()->LastScrolledLayerId());
+        CHECK(!impl->CurrentlyScrollingNode());
+        EXPECT_EQ(scrolling_node->id,
+                  impl->active_tree()->LastScrolledScrollNodeIndex());
 
         // Check the scroll is applied as a delta.
         EXPECT_VECTOR_EQ(initial_offset_,