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

Speculative revert to see if this affects memory stomping behaviours.

BUG=345757

Review URL: https://codereview.chromium.org/180243014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253612 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 4 deletions

diff --git a/cc/trees/occlusion_tracker_perftest.cc b/cc/trees/occlusion_tracker_perftest.cc
index f4a2faf..27123cd 100644
--- a/cc/trees/occlusion_tracker_perftest.cc
+++ b/cc/trees/occlusion_tracker_perftest.cc
@@ -91,8 +91,12 @@ TEST_F(OcclusionTrackerPerfTest, UnoccludedContentRect_FullyOccluded) {
   ASSERT_EQ(1u, rsll.size());
   EXPECT_EQ(1u, rsll[0]->render_surface()->layer_list().size());
 
-  LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll);
-  LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll);
+  typedef LayerIterator<LayerImpl,
+                        LayerImpl::LayerListType,
+                        LayerImpl::RenderSurfaceType,
+                        LayerIteratorActions::FrontToBack> IteratorType;
+  IteratorType begin = IteratorType::Begin(&rsll);
+  IteratorType end = IteratorType::End(&rsll);
 
   LayerIteratorPosition<LayerImpl> pos = begin;
 
@@ -166,8 +170,12 @@ TEST_F(OcclusionTrackerPerfTest, UnoccludedContentRect_10OpaqueLayers) {
   EXPECT_EQ(static_cast<size_t>(kNumOpaqueLayers),
             rsll[0]->render_surface()->layer_list().size());
 
-  LayerIterator<LayerImpl> begin = LayerIterator<LayerImpl>::Begin(&rsll);
-  LayerIterator<LayerImpl> end = LayerIterator<LayerImpl>::End(&rsll);
+  typedef LayerIterator<LayerImpl,
+                        LayerImpl::LayerListType,
+                        LayerImpl::RenderSurfaceType,
+                        LayerIteratorActions::FrontToBack> IteratorType;
+  IteratorType begin = IteratorType::Begin(&rsll);
+  IteratorType end = IteratorType::End(&rsll);
 
   // The opaque_layers add occlusion.
   for (int i = 0; i < kNumOpaqueLayers - 1; ++i) {