Revert of cc: Remove map lookup from RenderSurfaceImpl::EffectTreeIndex

cc/layers/render_surface_unittest.cc

Index: cc/layers/render_surface_unittest.cc
diff --git a/cc/layers/render_surface_unittest.cc b/cc/layers/render_surface_unittest.cc
index 7d9024fcd62c0de48455d8ba7361b2308a9f2e30..ac9dd0f415ebd3493f4d613232fe2d244de9e7a6 100644
--- a/cc/layers/render_surface_unittest.cc
+++ b/cc/layers/render_surface_unittest.cc
@@ -39,23 +39,16 @@
 
   FakeImplTaskRunnerProvider task_runner_provider;
   TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
-      FakeCompositorFrameSink::Create3d();
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);
   std::unique_ptr<LayerImpl> owning_layer =
       LayerImpl::Create(host_impl.active_tree(), 1);
-  owning_layer->test_properties()->force_render_surface = true;
+  owning_layer->SetHasRenderSurface(true);
+  ASSERT_TRUE(owning_layer->render_surface());
+  RenderSurfaceImpl* render_surface = owning_layer->render_surface();
   gfx::Rect test_rect(3, 4, 5, 6);
   host_impl.active_tree()->ResetAllChangeTracking();
   host_impl.active_tree()->SetRootLayerForTesting(std::move(owning_layer));
-  host_impl.SetVisible(true);
-  host_impl.InitializeRenderer(compositor_frame_sink.get());
-  host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
-  host_impl.active_tree()->UpdateDrawProperties(false /* update_lcd_text */);
-
-  RenderSurfaceImpl* render_surface =
-      host_impl.active_tree()->root_layer_for_testing()->render_surface();
-  ASSERT_TRUE(render_surface);
+  host_impl.active_tree()->BuildPropertyTreesForTesting();
 
   // Currently, the content_rect, clip_rect, and
   // owning_layer->layerPropertyChanged() are the only sources of change.