cc: Clean up OcclusionTracker template parameters.

cc/trees/occlusion_tracker_perftest.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/trees/occlusion_tracker.h"
 
 #include "base/time/time.h"
 #include "cc/layers/layer_iterator.h"
 #include "cc/layers/solid_color_layer_impl.h"
 #include "cc/test/fake_layer_tree_host_impl_client.h"
@@ skipping 53 matching lines @@
   FakeProxy proxy_;
   DebugScopedSetImplThread impl_;
   FakeRenderingStatsInstrumentation stats_;
   scoped_ptr<LayerTreeHostImpl> host_impl_;
 };
 
 TEST_F(OcclusionTrackerPerfTest, UnoccludedContentRect_FullyOccluded) {
   SetTestName("unoccluded_content_rect_fully_occluded");
 
   gfx::Rect viewport_rect(768, 1038);
-  OcclusionTrackerBase<LayerImpl, LayerImpl::RenderSurfaceType> tracker(
-      viewport_rect, false);
+  OcclusionTracker<LayerImpl> tracker(viewport_rect, false);
 
   CreateHost();
   host_impl_->SetViewportSize(viewport_rect.size());
 
   scoped_ptr<SolidColorLayerImpl> opaque_layer =
       SolidColorLayerImpl::Create(active_tree(), 2);
   opaque_layer->SetBackgroundColor(SK_ColorRED);
   opaque_layer->SetContentsOpaque(true);
   opaque_layer->SetDrawsContent(true);
   opaque_layer->SetBounds(viewport_rect.size());
@@ skipping 47 matching lines @@
   EXPECT_EQ(end, begin);
 
   PrintResults();
 }
 
 TEST_F(OcclusionTrackerPerfTest, UnoccludedContentRect_10OpaqueLayers) {
   static const int kNumOpaqueLayers = 10;
   SetTestName("unoccluded_content_rect_10_opaque_layers");
 
   gfx::Rect viewport_rect(768, 1038);
-  OcclusionTrackerBase<LayerImpl, LayerImpl::RenderSurfaceType> tracker(
-      viewport_rect, false);
+  OcclusionTracker<LayerImpl> tracker(viewport_rect, false);
 
   CreateHost();
   host_impl_->SetViewportSize(viewport_rect.size());
 
   for (int i = 0; i < kNumOpaqueLayers; ++i) {
     scoped_ptr<SolidColorLayerImpl> opaque_layer =
         SolidColorLayerImpl::Create(active_tree(), 2 + i);
     opaque_layer->SetBackgroundColor(SK_ColorRED);
     opaque_layer->SetContentsOpaque(true);
     opaque_layer->SetDrawsContent(true);
@@ skipping 49 matching lines @@
   EXPECT_EQ(active_tree()->root_layer(), next.current_layer);
 
   ++begin;
   EXPECT_EQ(end, begin);
 
   PrintResults();
 }
 
 }  // namespace
 }  // namespace cc