Rename LocalFrameId to LocalSurfaceId

cc/ipc/surface_id_struct_traits.h

Index: cc/ipc/surface_id_struct_traits.h
diff --git a/cc/ipc/surface_id_struct_traits.h b/cc/ipc/surface_id_struct_traits.h
index 6a9bee396f30b383e783ae7722dd42bfece7a5cc..3f3b7cd67f66e2a8267010ff6f016efb03f0b97f 100644
--- a/cc/ipc/surface_id_struct_traits.h
+++ b/cc/ipc/surface_id_struct_traits.h
@@ -6,10 +6,10 @@
 #define CC_IPC_SURFACE_ID_STRUCT_TRAITS_H_
 
 #include "cc/ipc/frame_sink_id_struct_traits.h"
-#include "cc/ipc/local_frame_id_struct_traits.h"
+#include "cc/ipc/local_surface_id_struct_traits.h"
 #include "cc/ipc/surface_id.mojom-shared.h"
 #include "cc/surfaces/frame_sink_id.h"
-#include "cc/surfaces/local_frame_id.h"
+#include "cc/surfaces/local_surface_id.h"
 #include "cc/surfaces/surface_id.h"
 
 namespace mojo {
@@ -20,13 +20,13 @@ struct StructTraits<cc::mojom::SurfaceIdDataView, cc::SurfaceId> {
     return id.frame_sink_id();
   }
 
-  static const cc::LocalFrameId& local_frame_id(const cc::SurfaceId& id) {
-    return id.local_frame_id();
+  static const cc::LocalSurfaceId& local_surface_id(const cc::SurfaceId& id) {
+    return id.local_surface_id();
   }
 
   static bool Read(cc::mojom::SurfaceIdDataView data, cc::SurfaceId* out) {
     return data.ReadFrameSinkId(&out->frame_sink_id_) &&
-           data.ReadLocalFrameId(&out->local_frame_id_);
+           data.ReadLocalSurfaceId(&out->local_surface_id_);
   }
 };