cc: Move Layer Id to Node Map to Individual Property Tree Private

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include <memory>
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 706 matching lines @@
   const cc::TransformNode& transformNode =
       *transformTree.Node(scrollNode.transform_id);
   EXPECT_TRUE(transformNode.local.IsIdentity());
   EXPECT_EQ(gfx::ScrollOffset(-7, -9), transformNode.scroll_offset);
 
   EXPECT_EQ(MainThreadScrollingReason::kNotScrollingOnMain,
             scrollNode.main_thread_scrolling_reasons);
 
   auto* layer = contentLayerAt(0);
   EXPECT_EQ(layer->id(), scrollNode.owning_layer_id);
-  auto scrollNodeIndexIt =
-      propertyTrees().layer_id_to_scroll_node_index.find(layer->id());
-  EXPECT_EQ(scrollNodeIndexIt->second, scrollNode.id);
+  auto scrollNodeIndex =
+      propertyTrees().scroll_tree.FindNodeIndexFromOwningLayerId(layer->id());
+  EXPECT_EQ(scrollNodeIndex, scrollNode.id);
 
   EXPECT_EQ(0u, scrollClient.didScrollCount);
   layer->SetScrollOffsetFromImplSide(gfx::ScrollOffset(1, 2));
   EXPECT_EQ(1u, scrollClient.didScrollCount);
   EXPECT_EQ(gfx::ScrollOffset(1, 2), scrollClient.lastScrollOffset);
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, TransformUnderScrollNode) {
   RefPtr<TransformPaintPropertyNode> scrollTranslation =
       TransformPaintPropertyNode::createScrollTranslation(
@@ skipping 1070 matching lines @@
 
   EXPECT_EQ(5u, rootLayer()->children().size());
   sequenceNumber++;
   EXPECT_EQ(sequenceNumber, propertyTrees().sequence_number);
   for (auto layer : rootLayer()->children()) {
     EXPECT_EQ(sequenceNumber, layer->property_tree_sequence_number());
   }
 }
 
 }  // namespace blink