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

content/renderer/android/synchronous_compositor_frame_sink.cc

Index: content/renderer/android/synchronous_compositor_frame_sink.cc
diff --git a/content/renderer/android/synchronous_compositor_frame_sink.cc b/content/renderer/android/synchronous_compositor_frame_sink.cc
index 36f96311be2b0e2788c98f8291aa50a940ecfe52..4113e6210d05e592ebc7534a07c63e7f8867d2cf 100644
--- a/content/renderer/android/synchronous_compositor_frame_sink.cc
+++ b/content/renderer/android/synchronous_compositor_frame_sink.cc
@@ -184,9 +184,9 @@ bool SynchronousCompositorFrameSink::BindToClient(
   display_.reset(new cc::Display(
       nullptr /* shared_bitmap_manager */,
       nullptr /* gpu_memory_buffer_manager */, software_renderer_settings,
-      nullptr /* begin_frame_source */, std::move(output_surface),
+      kFrameSinkId, nullptr /* begin_frame_source */, std::move(output_surface),
       nullptr /* scheduler */, nullptr /* texture_mailbox_deleter */));
-  display_->Initialize(&display_client_, surface_manager_.get(), kFrameSinkId);
+  display_->Initialize(&display_client_, surface_manager_.get());
   display_->SetVisible(true);
   return true;
 }
@@ -242,8 +242,8 @@ void SynchronousCompositorFrameSink::SubmitCompositorFrame(
       surface_factory_->Create(child_local_frame_id_);
     }
 
-    display_->SetSurfaceId(cc::SurfaceId(kFrameSinkId, root_local_frame_id_),
-                           frame.metadata.device_scale_factor);
+    display_->SetLocalFrameId(root_local_frame_id_,
+                              frame.metadata.device_scale_factor);
 
     // The layer compositor should be giving a frame that covers the
     // |sw_viewport_for_current_draw_| but at 0,0.