cc: Remove ScopedPtrVector and cc::remove_if.

This patch removes ScopedPtrVector and cc::remove_if. It depends on
https://codereview.chromium.org/1441613002 for TakeBack.

R=danakj
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1437413002

Cr-Commit-Position: refs/heads/master@{#360318}

1 files changed, 6 insertions, 6 deletions

diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index dddb80c5..c9c7495 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -2574,23 +2574,23 @@ void CalculateRenderSurfaceLayerListInternal(
   if (compute_content_rects && render_to_separate_surface)
     layer->render_surface()->SetAccumulatedContentRect(gfx::Rect());
 
-  for (auto& child_layer : layer->children()) {
+  for (const auto& child_layer : layer->children()) {
     CalculateRenderSurfaceLayerListInternal(
-        child_layer, property_trees, render_surface_layer_list, descendants,
-        nearest_occlusion_immune_ancestor, layer_is_drawn,
+        child_layer.get(), property_trees, render_surface_layer_list,
+        descendants, nearest_occlusion_immune_ancestor, layer_is_drawn,
         can_render_to_separate_surface, current_render_surface_layer_list_id,
         max_texture_size, verify_property_trees, use_property_trees);
 
     // If the child is its own render target, then it has a render surface.
-    if (child_layer->render_target() == child_layer &&
+    if (child_layer->render_target() == child_layer.get() &&
         !child_layer->render_surface()->layer_list().empty() &&
         !child_layer->render_surface()->content_rect().IsEmpty()) {
       // This child will contribute its render surface, which means
       // we need to mark just the mask layer (and replica mask layer)
       // with the id.
       MarkMasksWithRenderSurfaceLayerListId(
-          child_layer, current_render_surface_layer_list_id);
-      descendants->push_back(child_layer);
+          child_layer.get(), current_render_surface_layer_list_id);
+      descendants->push_back(child_layer.get());
     }
 
     if (child_layer->layer_or_descendant_is_drawn()) {