Introduce cc::LocalFrameId and use in SurfaceFactory

services/ui/ws/frame_generator.cc

Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index c749941cb081872394260803fdfffa0be50f4ecd..163546e0c78ed75b8ade196041813d21b57bf041 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -203,7 +203,7 @@ void FrameGenerator::DrawWindowTree(
     quad->SetAll(sqs, bounds_at_origin /* rect */,
                  gfx::Rect() /* opaque_rect */,
                  bounds_at_origin /* visible_rect */, true /* needs_blending*/,
-                 default_surface->id());
+                 default_surface->GetSurfaceId());
     if (default_surface->may_contain_video())
       *may_contain_video = true;
   }
@@ -227,7 +227,7 @@ void FrameGenerator::DrawWindowTree(
     quad->SetAll(sqs, bounds_at_origin /* rect */,
                  gfx::Rect() /* opaque_rect */,
                  bounds_at_origin /* visible_rect */, true /* needs_blending*/,
-                 underlay_surface->id());
+                 underlay_surface->GetSurfaceId());
     DCHECK(!underlay_surface->may_contain_video());
   }
 }