cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/layer_tree_host_common.cc

Index: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 832f8647f44aa874655e0ac5a3a85664bd5a6087..48ef3d1b30e78be839bc002da33488614159711d 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -2574,10 +2574,10 @@ void CalculateRenderSurfaceLayerListInternal(
   if (compute_content_rects && render_to_separate_surface)
     layer->render_surface()->SetAccumulatedContentRect(gfx::Rect());
 
-  for (auto& child_layer : layer->children()) {
+  for (const scoped_ptr<LayerImpl>& child_layer : layer->children()) {

[danakj, 2015/11/17 01:12:19]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

     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);
 
@@ -2589,8 +2589,8 @@ void CalculateRenderSurfaceLayerListInternal(
       // 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()) {