Revert "Revert 253606 "Revert 251238 "cc: Clean up iterator template to ...""

cc/trees/quad_culler_unittest.cc

 // Copyright 2012 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/quad_culler.h"
 
 #include <vector>
 
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
@@ skipping 21 matching lines @@
  public:
   TestOcclusionTrackerImpl(const gfx::Rect& scissor_rect_in_screen,
                            bool record_metrics_for_frame = true)
       : TestOcclusionTrackerBase(scissor_rect_in_screen,
                                  record_metrics_for_frame) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestOcclusionTrackerImpl);
 };
 
-typedef LayerIterator<LayerImpl> LayerIteratorType;
+typedef LayerIterator<LayerImpl,
+                      LayerImplList,
+                      RenderSurfaceImpl,
+                      LayerIteratorActions::FrontToBack> LayerIteratorType;
 
 class QuadCullerTest : public testing::Test {
  public:
   QuadCullerTest()
       : host_impl_(&proxy_),
         layer_id_(1) {}
 
   scoped_ptr<TiledLayerImpl> MakeLayer(TiledLayerImpl* parent,
                                        const gfx::Transform& draw_transform,
                                        const gfx::Rect& layer_rect,
@@ skipping 854 matching lines @@
   EXPECT_EQ(gfx::Rect(15, 10, 5, 11).ToString(),
             quad_list[0]->visible_rect.ToString());
   EXPECT_EQ(gfx::Rect(15, 20, 8, 14).ToString(),
             quad_list[1]->visible_rect.ToString());
   EXPECT_EQ(gfx::Rect(15, 30, 10, 16).ToString(),
             quad_list[2]->visible_rect.ToString());
 }
 
 }  // namespace
 }  // namespace cc