Rename EvictFrame, EvictSurface to EvictCurrentSurface

cc/surfaces/surface_hittest_unittest.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 <stddef.h>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/surface.h"
@@ skipping 86 matching lines @@
 
   {
     SurfaceHittest hittest(nullptr, &manager);
     // It is expected this test will complete without crashes.
     gfx::Transform transform;
     EXPECT_EQ(root_surface_id,
               hittest.GetTargetSurfaceAtPoint(
                   root_surface_id, gfx::Point(100, 100), &transform));
   }
 
-  root_support->EvictFrame();
+  root_support->EvictCurrentSurface();
 }
 
 TEST(SurfaceHittestTest, Hittest_SingleSurface) {
   SurfaceManager manager;
 
   // Set up root FrameSink.
   FrameSinkId root_frame_sink_id(1, 1);
   std::unique_ptr<CompositorFrameSinkSupport> root_support =
       CompositorFrameSinkSupport::Create(
           nullptr, &manager, root_frame_sink_id, kIsRoot,
@@ skipping 14 matching lines @@
     {
       root_surface_id,
       gfx::Point(100, 100),
       root_surface_id,
       gfx::Point(100, 100)
     },
   };
 
   RunTests(nullptr, &manager, tests, arraysize(tests));
 
-  root_support->EvictFrame();
+  root_support->EvictCurrentSurface();
 }
 
 TEST(SurfaceHittestTest, Hittest_ChildSurface) {
   SurfaceManager manager;
 
   // Set up root FrameSink.
   FrameSinkId root_frame_sink_id(1, 1);
   std::unique_ptr<CompositorFrameSinkSupport> root_support =
       CompositorFrameSinkSupport::Create(
           nullptr, &manager, root_frame_sink_id, kIsRoot,
@@ skipping 119 matching lines @@
 
     gfx::Point point_in_target_space(100, 100);
     gfx::Transform target_transform;
     EXPECT_TRUE(hittest.GetTransformToTargetSurface(
         root_surface_id, child_surface_id, &target_transform));
     target_transform.TransformPoint(&point_in_target_space);
     EXPECT_NE(transform, target_transform);
     EXPECT_EQ(gfx::Point(25, 25), point_in_target_space);
   }
 
-  root_support->EvictFrame();
-  child_support->EvictFrame();
+  root_support->EvictCurrentSurface();
+  child_support->EvictCurrentSurface();
 }
 
 // This test verifies that hit testing will progress to the next quad if it
 // encounters an invalid RenderPassDrawQuad for whatever reason.
 TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
   SurfaceManager manager;
 
   // Set up root FrameSink.
   FrameSinkId root_frame_sink_id(1, 1);
   std::unique_ptr<CompositorFrameSinkSupport> root_support =
@@ skipping 91 matching lines @@
     {
       root_surface_id,
       gfx::Point(290, 290),
       root_surface_id,
       gfx::Point(290, 290)
     }
   };
 
   RunTests(nullptr, &manager, tests, arraysize(tests));
 
-  root_support->EvictFrame();
-  child_support->EvictFrame();
+  root_support->EvictCurrentSurface();
+  child_support->EvictCurrentSurface();
 }
 
 TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
   SurfaceManager manager;
   FrameSinkId root_frame_sink_id(kArbitraryFrameSinkId);
   std::unique_ptr<CompositorFrameSinkSupport> support =
       CompositorFrameSinkSupport::Create(
           nullptr, &manager, root_frame_sink_id, kIsRoot,
           kHandlesFrameSinkIdInvalidation, kNeedsSyncPoints);
 
@@ skipping 82 matching lines @@
     {
       root_surface_id,
       gfx::Point(100, 100),
       root_surface_id,
       gfx::Point(100, 100)
     }
   };
 
   RunTests(nullptr, &manager, tests, arraysize(tests));
 
-  support->EvictFrame();
+  support->EvictCurrentSurface();
 }
 
 TEST(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
   SurfaceManager manager;
 
   // Set up root FrameSink.
   FrameSinkId root_frame_sink_id(1, 1);
   std::unique_ptr<CompositorFrameSinkSupport> root_support =
       CompositorFrameSinkSupport::Create(
           nullptr, &manager, root_frame_sink_id, kIsRoot,
@@ skipping 117 matching lines @@
   TestSurfaceHittestDelegate accept_delegate;
   accept_delegate.AddInsetsForAcceptSurface(child_surface_id,
                                             gfx::Insets(5, 5, 5, 5));
   RunTests(&accept_delegate, &manager, test_expectations_with_accept_insets,
            arraysize(test_expectations_with_accept_insets));
 
   // Verify that insets have affected hit targeting.
   EXPECT_EQ(0, accept_delegate.reject_target_overrides());
   EXPECT_EQ(2, accept_delegate.accept_target_overrides());
 
-  root_support->EvictFrame();
-  child_support->EvictFrame();
+  root_support->EvictCurrentSurface();
+  child_support->EvictCurrentSurface();
 }
 
 }  // namespace cc