Replaced cc::Display::SetSurfaceId() with SetLocalFrameId()

services/ui/surfaces/display_compositor_frame_sink.cc

Index: services/ui/surfaces/display_compositor_frame_sink.cc
diff --git a/services/ui/surfaces/display_compositor_frame_sink.cc b/services/ui/surfaces/display_compositor_frame_sink.cc
index bc7bd8353dce00e5fbb06127bf2f244e4e13ecf0..d68c64bf6bbb0b318894e6ff35818d7e2895bfde 100644
--- a/services/ui/surfaces/display_compositor_frame_sink.cc
+++ b/services/ui/surfaces/display_compositor_frame_sink.cc
@@ -73,10 +73,11 @@ DisplayCompositorFrameSink::DisplayCompositorFrameSink(
 
   display_.reset(new cc::Display(
       nullptr /* bitmap_manager */, gpu_memory_buffer_manager,
-      cc::RendererSettings(), std::move(synthetic_begin_frame_source),
+      cc::RendererSettings(), frame_sink_id_,
+      std::move(synthetic_begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get())));
-  display_->Initialize(this, display_compositor_->manager(), frame_sink_id_);
+  display_->Initialize(this, display_compositor_->manager());
   display_->SetVisible(true);
 }
 
@@ -98,8 +99,8 @@ void DisplayCompositorFrameSink::SubmitCompositorFrame(
     display_size_ = frame_size;
     display_->Resize(display_size_);
   }
-  display_->SetSurfaceId(cc::SurfaceId(frame_sink_id_, local_frame_id_),
-                         frame.metadata.device_scale_factor);
+  display_->SetLocalFrameId(local_frame_id_,
+                            frame.metadata.device_scale_factor);
   factory_.SubmitCompositorFrame(local_frame_id_, std::move(frame), callback);
 }