cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/layer_tree_host_common_perftest.cc

 // Copyright 2013 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/trees/layer_tree_host_common.h"
 
 #include <deque>
 #include <sstream>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer.h"
 #include "cc/output/bsp_tree.h"
 #include "cc/quads/draw_polygon.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/layer_tree_json_parser.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/test/paths.h"
@@ skipping 119 matching lines @@
     int max_texture_size = 8096;
     DoCalcDrawPropertiesImpl(can_render_to_separate_surface,
                              max_texture_size,
                              active_tree,
                              host_impl);
 
     LayerImplList base_list;
     BuildLayerImplList(active_tree->root_layer(), &base_list);
 
     int polygon_counter = 0;
-    ScopedPtrVector<DrawPolygon> polygon_list;
+    std::vector<scoped_ptr<DrawPolygon>> polygon_list;
     for (LayerImplList::iterator it = base_list.begin(); it != base_list.end();
          ++it) {
       DrawPolygon* draw_polygon =
           new DrawPolygon(NULL, gfx::RectF(gfx::SizeF((*it)->bounds())),
                           (*it)->draw_transform(), polygon_counter++);
       polygon_list.push_back(scoped_ptr<DrawPolygon>(draw_polygon));
     }
 
     timer_.Reset();
     do {
       std::deque<scoped_ptr<DrawPolygon>> test_list;
       for (int i = 0; i < num_duplicates_; i++) {
         for (size_t i = 0; i < polygon_list.size(); i++) {
           test_list.push_back(polygon_list[i]->CreateCopy());
         }
       }
       BspTree bsp_tree(&test_list);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     EndTest();
   }
 
   void BuildLayerImplList(LayerImpl* layer, LayerImplList* list) {
     if (layer->Is3dSorted()) {
       list->push_back(layer);
     }
 
     for (size_t i = 0; i < layer->children().size(); i++) {
-      BuildLayerImplList(layer->children()[i], list);
+      BuildLayerImplList(layer->children()[i].get(), list);
     }
   }
 
  private:
   LayerImplList base_list_;
   int num_duplicates_;
 };
 
 TEST_F(CalcDrawPropsTest, TenTen) {
   SetTestName("10_10");
@@ skipping 64 matching lines @@
 
 TEST_F(BspTreePerfTest, BspTreeCubes_4) {
   SetTestName("bsp_tree_cubes_4");
   SetNumberOfDuplicates(4);
   ReadTestFile("layer_sort_cubes");
   RunSortLayers();
 }
 
 }  // namespace
 }  // namespace cc