Rename LocalFrameId to LocalSurfaceId

ui/android/delegated_frame_host_android.cc

Index: ui/android/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index feb9e24abcce19ad057da8d30c979430690f4598..5b6ecf9b42f12453d9c4d0671b595c1ff1594cc5 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -109,7 +109,7 @@ void DelegatedFrameHostAndroid::SubmitCompositorFrame(
     DCHECK(!current_frame_);
 
     current_frame_ = base::MakeUnique<FrameData>();
-    current_frame_->local_frame_id = surface_id_allocator_->GenerateId();
+    current_frame_->local_surface_id = surface_id_allocator_->GenerateId();
     current_frame_->surface_size = surface_size;
     current_frame_->top_controls_height = frame.metadata.top_controls_height;
     current_frame_->top_controls_shown_ratio =
@@ -121,18 +121,18 @@ void DelegatedFrameHostAndroid::SubmitCompositorFrame(
     current_frame_->has_transparent_background =
         root_pass->has_transparent_background;
     current_frame_->viewport_selection = frame.metadata.selection;
-    surface_factory_->SubmitCompositorFrame(current_frame_->local_frame_id,
+    surface_factory_->SubmitCompositorFrame(current_frame_->local_surface_id,
                                             std::move(frame), draw_callback);
 
     content_layer_ = CreateSurfaceLayer(
         surface_manager_, cc::SurfaceId(surface_factory_->frame_sink_id(),
-                                        current_frame_->local_frame_id),
+                                        current_frame_->local_surface_id),
         current_frame_->surface_size,
         !current_frame_->has_transparent_background);
     view_->GetLayer()->AddChild(content_layer_);
     UpdateBackgroundLayer();
   } else {
-    surface_factory_->SubmitCompositorFrame(current_frame_->local_frame_id,
+    surface_factory_->SubmitCompositorFrame(current_frame_->local_surface_id,
                                             std::move(frame), draw_callback);
   }
 }
@@ -150,7 +150,7 @@ void DelegatedFrameHostAndroid::RequestCopyOfSurface(
 
   scoped_refptr<cc::Layer> readback_layer = CreateSurfaceLayer(
       surface_manager_, cc::SurfaceId(surface_factory_->frame_sink_id(),
-                                      current_frame_->local_frame_id),
+                                      current_frame_->local_surface_id),
       current_frame_->surface_size,
       !current_frame_->has_transparent_background);
   readback_layer->SetHideLayerAndSubtree(true);