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

cc/layers/layer_iterator_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/layers/layer_iterator.h"
 
 #include <vector>
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_layer_tree_host.h"
@@ skipping 32 matching lines @@
   virtual ~TestLayer() {}
 
   bool draws_content_;
 };
 
 #define EXPECT_COUNT(layer, target, contrib, itself)                           \
   EXPECT_EQ(target, layer->count_representing_target_surface_);                \
   EXPECT_EQ(contrib, layer->count_representing_contributing_surface_);         \
   EXPECT_EQ(itself, layer->count_representing_itself_);
 
-typedef LayerIterator<Layer> FrontToBack;
+typedef LayerIterator<Layer,
+                      RenderSurfaceLayerList,
+                      RenderSurface,
+                      LayerIteratorActions::FrontToBack> FrontToBack;
 
 void ResetCounts(RenderSurfaceLayerList* render_surface_layer_list) {
   for (unsigned surface_index = 0;
        surface_index < render_surface_layer_list->size();
        ++surface_index) {
     TestLayer* render_surface_layer = static_cast<TestLayer*>(
         render_surface_layer_list->at(surface_index));
     RenderSurface* render_surface = render_surface_layer->render_surface();
 
     render_surface_layer->count_representing_target_surface_ = -1;
@@ skipping 144 matching lines @@
   EXPECT_COUNT(root21, -1, -1, 9);
   EXPECT_COUNT(root22, 7, 8, 6);
   EXPECT_COUNT(root221, -1, -1, 5);
   EXPECT_COUNT(root23, 3, 4, 2);
   EXPECT_COUNT(root231, -1, -1, 1);
   EXPECT_COUNT(root3, -1, -1, 0);
 }
 
 }  // namespace
 }  // namespace cc