Rename EvictFrame, EvictSurface to EvictCurrentSurface

cc/surfaces/surface_manager_ref_unittest.cc

 // Copyright 2016 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 <unordered_map>
 #include <vector>
 
 #include "base/containers/flat_set.h"
@@ skipping 30 matching lines @@
   SurfaceId CreateSurface(const FrameSinkId& frame_sink_id, uint32_t local_id) {
     LocalSurfaceId local_surface_id(local_id,
                                     base::UnguessableToken::Deserialize(0, 1u));
     GetCompositorFrameSinkSupport(frame_sink_id)
         .SubmitCompositorFrame(local_surface_id, test::MakeCompositorFrame());
     return SurfaceId(frame_sink_id, local_surface_id);
   }
 
   // Destroy Surface with |surface_id|.
   void DestroySurface(const SurfaceId& surface_id) {
-    GetCompositorFrameSinkSupport(surface_id.frame_sink_id()).EvictFrame();
+    GetCompositorFrameSinkSupport(surface_id.frame_sink_id())
+        .EvictCurrentSurface();
   }
 
   CompositorFrameSinkSupport& GetCompositorFrameSinkSupport(
       const FrameSinkId& frame_sink_id) {
     auto& support_ptr = supports_[frame_sink_id];
     if (!support_ptr) {
       constexpr bool is_root = false;
       constexpr bool handles_frame_sink_id_invalidation = true;
       constexpr bool needs_sync_points = true;
       support_ptr = CompositorFrameSinkSupport::Create(
@@ skipping 42 matching lines @@
 
  protected:
   // testing::Test:
   void SetUp() override {
     // Start each test with a fresh SurfaceManager instance.
     manager_ = base::MakeUnique<SurfaceManager>(
         SurfaceManager::LifetimeType::REFERENCES);
   }
   void TearDown() override {
     for (auto& support : supports_)
-      support.second->EvictFrame();
+      support.second->EvictCurrentSurface();
     supports_.clear();
     manager_.reset();
   }
 
   std::unordered_map<FrameSinkId,
                      std::unique_ptr<CompositorFrameSinkSupport>,
                      FrameSinkIdHash>
       supports_;
   std::unique_ptr<SurfaceManager> manager_;
 };
@@ skipping 382 matching lines @@
   ASSERT_THAT(GetAllTempReferences(), UnorderedElementsAre(id1b));
 
   // If the parent has crashed then the window server will have already removed
   // it from the ServerWindow hierarchy and won't have an owner for |id2b|. The
   // window server will ask to drop the reference instead.
   manager().DropTemporaryReference(id1b);
   ASSERT_THAT(GetAllTempReferences(), IsEmpty());
 }
 
 }  // namespace cc