Introduce cc::LocalFrameId and use in SurfaceFactory

content/renderer/android/synchronous_compositor_frame_sink.h

Index: content/renderer/android/synchronous_compositor_frame_sink.h
diff --git a/content/renderer/android/synchronous_compositor_frame_sink.h b/content/renderer/android/synchronous_compositor_frame_sink.h
index 62bf8ce625cdedd4dd6353d75052a94ef3244045..a71e8900f8c54ab3ae801630e9ace8945f890a8c 100644
--- a/content/renderer/android/synchronous_compositor_frame_sink.h
+++ b/content/renderer/android/synchronous_compositor_frame_sink.h
@@ -148,8 +148,8 @@ class SynchronousCompositorFrameSink
   // is owned/destroyed on the compositor thread.
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
-  cc::SurfaceId root_surface_id_;
-  cc::SurfaceId child_surface_id_;
+  cc::LocalFrameId root_local_frame_id_;
+  cc::LocalFrameId child_local_frame_id_;
   // Uses surface_manager_.
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
   StubDisplayClient display_client_;