Rename LocalFrameId to LocalSurfaceId

cc/surfaces/referenced_surface_tracker_unittest.cc

Index: cc/surfaces/referenced_surface_tracker_unittest.cc
diff --git a/cc/surfaces/referenced_surface_tracker_unittest.cc b/cc/surfaces/referenced_surface_tracker_unittest.cc
index 119b4a57bbe1721ac46799655218b9346b68f66f..2e31f2bda1abfca4a09024ec44894275e8038ab8 100644
--- a/cc/surfaces/referenced_surface_tracker_unittest.cc
+++ b/cc/surfaces/referenced_surface_tracker_unittest.cc
@@ -34,7 +34,7 @@ std::vector<SurfaceId> empty_surface_ids() {
 SurfaceId MakeSurfaceId(const FrameSinkId& frame_sink_id, uint32_t local_id) {
   return SurfaceId(
       frame_sink_id,
-      LocalFrameId(local_id, base::UnguessableToken::Deserialize(0, 1u)));
+      LocalSurfaceId(local_id, base::UnguessableToken::Deserialize(0, 1u)));
 }
 
 }  // namespace
@@ -67,7 +67,7 @@ TEST_F(ReferencedSurfaceTrackerTest, SetCurrentSurfaceId) {
   EXPECT_FALSE(tracker().current_surface_id().is_valid());
 
   // After setting current SurfaceId then current_surface_id() should be valid.
-  tracker().UpdateReferences(parent_id.local_frame_id(), empty_surface_ids());
+  tracker().UpdateReferences(parent_id.local_surface_id(), empty_surface_ids());
   EXPECT_EQ(parent_id, tracker().current_surface_id());
 }
 
@@ -77,7 +77,7 @@ TEST_F(ReferencedSurfaceTrackerTest, RefSurface) {
   const SurfaceReference reference(parent_id, child_id1);
 
   // First frame has a reference to |child_id1|, check that reference is added.
-  tracker().UpdateReferences(parent_id.local_frame_id(), {child_id1});
+  tracker().UpdateReferences(parent_id.local_surface_id(), {child_id1});
   EXPECT_THAT(tracker().references_to_add(), UnorderedElementsAre(reference));
   EXPECT_THAT(tracker().references_to_remove(), IsEmpty());
 }
@@ -88,13 +88,13 @@ TEST_F(ReferencedSurfaceTrackerTest, NoChangeToReferences) {
   const SurfaceReference reference(parent_id, child_id1);
 
   // First frame has a reference to |child_id1|, check that reference is added.
-  tracker().UpdateReferences(parent_id.local_frame_id(), {child_id1});
+  tracker().UpdateReferences(parent_id.local_surface_id(), {child_id1});
   EXPECT_THAT(tracker().references_to_remove(), IsEmpty());
   EXPECT_THAT(tracker().references_to_add(), UnorderedElementsAre(reference));
 
   // Second frame has same reference, check that no references are added or
   // removed.
-  tracker().UpdateReferences(parent_id.local_frame_id(), {child_id1});
+  tracker().UpdateReferences(parent_id.local_surface_id(), {child_id1});
   EXPECT_THAT(tracker().references_to_remove(), IsEmpty());
   EXPECT_THAT(tracker().references_to_add(), IsEmpty());
 }
@@ -104,11 +104,11 @@ TEST_F(ReferencedSurfaceTrackerTest, UnrefSurface) {
   const SurfaceId child_id1 = MakeSurfaceId(kChildFrameSink1, 1);
   const SurfaceReference reference(parent_id, child_id1);
 
-  tracker().UpdateReferences(parent_id.local_frame_id(), {child_id1});
+  tracker().UpdateReferences(parent_id.local_surface_id(), {child_id1});
 
   // Second frame no longer references |child_id1|, check that reference to is
   // removed.
-  tracker().UpdateReferences(parent_id.local_frame_id(), empty_surface_ids());
+  tracker().UpdateReferences(parent_id.local_surface_id(), empty_surface_ids());
   EXPECT_THAT(tracker().references_to_add(), IsEmpty());
   EXPECT_THAT(tracker().references_to_remove(),
               UnorderedElementsAre(reference));
@@ -122,14 +122,14 @@ TEST_F(ReferencedSurfaceTrackerTest, RefNewSurfaceForFrameSink) {
   const SurfaceReference reference_second(parent_id, child_id1_second);
 
   // First frame has reference to |child_id1_first|.
-  tracker().UpdateReferences(parent_id.local_frame_id(), {child_id1_first});
+  tracker().UpdateReferences(parent_id.local_surface_id(), {child_id1_first});
   EXPECT_THAT(tracker().references_to_add(),
               UnorderedElementsAre(reference_first));
 
   // Second frame has reference to |child_id1_second| which has the same
-  // FrameSinkId but different LocalFrameId. Check that first reference is
+  // FrameSinkId but different LocalSurfaceId. Check that first reference is
   // removed and second reference is added.
-  tracker().UpdateReferences(parent_id.local_frame_id(), {child_id1_second});
+  tracker().UpdateReferences(parent_id.local_surface_id(), {child_id1_second});
   EXPECT_THAT(tracker().references_to_remove(),
               UnorderedElementsAre(reference_first));
   EXPECT_THAT(tracker().references_to_add(),
@@ -143,13 +143,13 @@ TEST_F(ReferencedSurfaceTrackerTest, UpdateParentSurfaceId) {
   const SurfaceReference reference(parent_id_second, child_id1);
 
   // First frame references |child_id1|.
-  tracker().UpdateReferences(parent_id_first.local_frame_id(), {child_id1});
+  tracker().UpdateReferences(parent_id_first.local_surface_id(), {child_id1});
   EXPECT_THAT(tracker().references_to_add(), SizeIs(1));
 
   // Second frame still reference |child_id1| but the parent SurfaceId has
   // changed. The new parent SurfaceId should have a reference added to
   // |child_id1|.
-  tracker().UpdateReferences(parent_id_second.local_frame_id(), {child_id1});
+  tracker().UpdateReferences(parent_id_second.local_surface_id(), {child_id1});
   EXPECT_THAT(tracker().references_to_add(), UnorderedElementsAre(reference));
   EXPECT_THAT(tracker().references_to_remove(), IsEmpty());
 }
@@ -162,14 +162,14 @@ TEST_F(ReferencedSurfaceTrackerTest, RefTwoThenUnrefOneSurface) {
   const SurfaceReference reference2(parent_id, child_id2);
 
   // First frame references both surfaces.
-  tracker().UpdateReferences(parent_id.local_frame_id(),
+  tracker().UpdateReferences(parent_id.local_surface_id(),
                              {child_id1, child_id2});
   EXPECT_THAT(tracker().references_to_add(),
               UnorderedElementsAre(reference1, reference2));
 
   // Second frame references only |child_id2|, check that reference to
   // |child_id1| is removed.
-  tracker().UpdateReferences(parent_id.local_frame_id(), {child_id2});
+  tracker().UpdateReferences(parent_id.local_surface_id(), {child_id2});
   EXPECT_THAT(tracker().references_to_remove(),
               UnorderedElementsAre(reference1));
   EXPECT_THAT(tracker().references_to_add(), IsEmpty());