Use custom ListContainer to allocate DrawQuads

cc/surfaces/surface_aggregator_test_helpers.cc

 // Copyright 2014 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/surfaces/surface_aggregator_test_helpers.h"
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 88 matching lines @@
   for (size_t i = 0; i < pass_count; ++i) {
     Pass pass = passes[i];
     TestRenderPass* test_pass =
         AddRenderPass(pass_list, pass.id, output_rect, root_transform);
     for (size_t j = 0; j < pass.quad_count; ++j) {
       AddQuadInPass(test_pass, pass.quads[j]);
     }
   }
 }
 
-void TestQuadMatchesExpectations(Quad expected_quad, DrawQuad* quad) {
+void TestQuadMatchesExpectations(Quad expected_quad, const DrawQuad* quad) {
   switch (expected_quad.material) {
     case DrawQuad::SOLID_COLOR: {
       ASSERT_EQ(DrawQuad::SOLID_COLOR, quad->material);
 
       const SolidColorDrawQuad* solid_color_quad =
           SolidColorDrawQuad::MaterialCast(quad);
 
       EXPECT_EQ(expected_quad.color, solid_color_quad->color);
       break;
     }
     case DrawQuad::RENDER_PASS: {
       ASSERT_EQ(DrawQuad::RENDER_PASS, quad->material);
 
       const RenderPassDrawQuad* render_pass_quad =
           RenderPassDrawQuad::MaterialCast(quad);
 
       EXPECT_EQ(expected_quad.render_pass_id, render_pass_quad->render_pass_id);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
-void TestPassMatchesExpectations(Pass expected_pass, RenderPass* pass) {
+void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass) {
   ASSERT_EQ(expected_pass.quad_count, pass->quad_list.size());
-  for (size_t i = 0u; i < pass->quad_list.size(); ++i) {
+  size_t i = 0;
+  for (QuadList::ConstIterator iter = pass->quad_list.begin();
+       iter != pass->quad_list.end();
+       ++iter) {
     SCOPED_TRACE(base::StringPrintf("Quad number %" PRIuS, i));
-    TestQuadMatchesExpectations(expected_pass.quads[i], pass->quad_list.at(i));
+    TestQuadMatchesExpectations(expected_pass.quads[i], &*iter);
+    ++i;
   }
 }
 
 void TestPassesMatchExpectations(Pass* expected_passes,
                                  size_t expected_pass_count,
-                                 RenderPassList* passes) {
+                                 const RenderPassList* passes) {
   ASSERT_EQ(expected_pass_count, passes->size());
 
   for (size_t i = 0; i < passes->size(); ++i) {
     SCOPED_TRACE(base::StringPrintf("Pass number %" PRIuS, i));
     RenderPass* pass = passes->at(i);
     TestPassMatchesExpectations(expected_passes[i], pass);
   }
 }
 
 }  // namespace test
 }  // namespace cc