Get rid of two callsites of effect_tree.FindNodeIndexFromOwningLayerId.

cc/test/layer_test_common.cc

Index: cc/test/layer_test_common.cc
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc
index b741dc0d673f87598b02aa9d6806ccd312cb79e0..d023a8a9f356c8aaea5aaec7894a728404f41106 100644
--- a/cc/test/layer_test_common.cc
+++ b/cc/test/layer_test_common.cc
@@ -35,20 +35,12 @@ RenderSurfaceImpl* GetRenderSurface(LayerImpl* layer_impl) {
   EffectTree& effect_tree =
       layer_impl->layer_tree_impl()->property_trees()->effect_tree;
 
-  EffectNode* effect_node = effect_tree.Node(layer_impl->effect_tree_index());
-  if (effect_node->owning_layer_id == layer_impl->id())
-    return effect_tree.GetRenderSurface(layer_impl->effect_tree_index());
-  return nullptr;
-}
-
-const RenderSurfaceImpl* GetRenderSurface(const LayerImpl* layer_impl) {
-  EffectTree& effect_tree =
-      layer_impl->layer_tree_impl()->property_trees()->effect_tree;
+  if (RenderSurfaceImpl* surface =

[chrishtr, 2017/05/11 20:07:00]

The old test code assumed that a layer "owned" a render surface; now it
checks for into what render surface a layer draws.

[chrishtr, 2017/05/11 22:15:39]

Right.

+          effect_tree.GetRenderSurface(layer_impl->effect_tree_index()))
+    return surface;
 
-  EffectNode* effect_node = effect_tree.Node(layer_impl->effect_tree_index());
-  if (effect_node->owning_layer_id == layer_impl->id())
-    return effect_tree.GetRenderSurface(layer_impl->effect_tree_index());
-  return nullptr;
+  return effect_tree.GetRenderSurface(
+      effect_tree.Node(layer_impl->effect_tree_index())->target_id);
 }
 
 static bool CanRectFBeSafelyRoundedToRect(const gfx::RectF& r) {