Rename EvictFrame, EvictSurface to EvictCurrentSurface

cc/surfaces/surface_aggregator_perftest.cc

 // Copyright 2015 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 "base/memory/ptr_util.h"
 #include "cc/base/lap_timer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/surfaces/compositor_frame_sink_support.h"
@@ skipping 128 matching lines @@
 
       CompositorFrame aggregated = aggregator_->Aggregate(
           SurfaceId(FrameSinkId(1, num_surfaces + 1),
                     LocalSurfaceId(num_surfaces + 1, kArbitraryToken)));
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("aggregator_speed", "", name, timer_.LapsPerSecond(),
                            "runs/s", true);
     for (int i = 0; i < num_surfaces; i++)
-      child_supports[i]->EvictFrame();
-    root_support->EvictFrame();
+      child_supports[i]->EvictCurrentSurface();
+    root_support->EvictCurrentSurface();
   }
 
  protected:
   SurfaceManager manager_;
   scoped_refptr<TestContextProvider> context_provider_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;
   std::unique_ptr<SurfaceAggregator> aggregator_;
   LapTimer timer_;
 };
@@ skipping 21 matching lines @@
 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesDamageCalc) {
   RunTest(3, 1000, 1.f, true, true, "few_surfaces_damage_calc");
 }
 
 TEST_F(SurfaceAggregatorPerfTest, FewSurfacesAggregateDamaged) {
   RunTest(3, 1000, 1.f, true, false, "few_surfaces_aggregate_damaged");
 }
 
 }  // namespace
 }  // namespace cc