cc: Remove ScopedPtrVector and cc::remove_if.

cc/output/overlay_strategy_sandwich.cc

 // Copyright 2015 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 "cc/output/overlay_strategy_sandwich.h"
 
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/output/overlay_candidate_validator.h"
 #include "cc/quads/draw_quad.h"
@@ skipping 29 matching lines @@
 
 OverlayStrategySandwich::~OverlayStrategySandwich() {}
 
 bool OverlayStrategySandwich::Attempt(ResourceProvider* resource_provider,
                                       RenderPassList* render_passes,
                                       OverlayCandidateList* candidate_list,
                                       gfx::Rect* damage_rect) {
   QuadList& quad_list = render_passes->back()->quad_list;
   for (auto it = quad_list.begin(); it != quad_list.end();) {
     OverlayCandidate candidate;
-    if (OverlayCandidate::FromDrawQuad(resource_provider, *it, &candidate))
-      it = TryOverlay(render_passes->back(), candidate_list, candidate, it);
-    else
+    if (OverlayCandidate::FromDrawQuad(resource_provider, *it, &candidate)) {
+      it = TryOverlay(render_passes->back().get(), candidate_list, candidate,
+                      it);
+    } else {
       ++it;
+    }
   }
 
   return candidate_list->size() > 1;
 }
 
 QuadList::Iterator OverlayStrategySandwich::TryOverlay(
     RenderPass* render_pass,
     OverlayCandidateList* candidate_list,
     const OverlayCandidate& candidate,
     QuadList::Iterator candidate_iter_in_quad_list) {
@@ skipping 109 matching lines @@
                                SK_ColorTRANSPARENT, true);
       ++candidate_iter_in_quad_list;
     }
   }
 
   candidate_list->swap(new_candidate_list);
   return candidate_iter_in_quad_list;
 }
 
 }  // namespace cc