cc: Remove ScopedPtrVector and cc::remove_if.

cc/output/overlay_strategy_sandwich.cc

Index: cc/output/overlay_strategy_sandwich.cc
diff --git a/cc/output/overlay_strategy_sandwich.cc b/cc/output/overlay_strategy_sandwich.cc
index cacb696832661b4d718c41628dd30a770c84f7fc..6aef45df36a3bbcaee485cbdf1527154d81944f1 100644
--- a/cc/output/overlay_strategy_sandwich.cc
+++ b/cc/output/overlay_strategy_sandwich.cc
@@ -47,10 +47,12 @@ bool OverlayStrategySandwich::Attempt(ResourceProvider* resource_provider,
   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;