Replace usage of SurfaceId's client_id with FrameSinkId

android_webview/browser/surfaces_instance.cc

Index: android_webview/browser/surfaces_instance.cc
diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
index 353c36a1d783a4092181ad75e609764e1823cffa..8f99bb22c6b184a0cfb724a271b014cc26d3a5f3 100644
--- a/android_webview/browser/surfaces_instance.cc
+++ b/android_webview/browser/surfaces_instance.cc
@@ -38,8 +38,7 @@ scoped_refptr<SurfacesInstance> SurfacesInstance::GetOrCreateInstance() {
   return make_scoped_refptr(new SurfacesInstance);
 }
 
-SurfacesInstance::SurfacesInstance()
-    : next_surface_client_id_(1u) {
+SurfacesInstance::SurfacesInstance() : next_frame_sink_id_(1u) {
   cc::RendererSettings settings;
 
   // Should be kept in sync with compositor_impl_android.cc.
@@ -50,9 +49,9 @@ SurfacesInstance::SurfacesInstance()
   settings.should_clear_root_render_pass = false;
 
   surface_manager_.reset(new cc::SurfaceManager);
-  surface_id_allocator_.reset(
-      new cc::SurfaceIdAllocator(next_surface_client_id_++));
-  surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
+  surface_id_allocator_.reset(new cc::SurfaceIdAllocator(
+      cc::FrameSinkId(next_frame_sink_id_++, 0 /* frame_sink_id */)));
+  surface_manager_->RegisterFrameSinkId(surface_id_allocator_->frame_sink_id());
 
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source(
       new cc::StubBeginFrameSource);
@@ -72,7 +71,7 @@ SurfacesInstance::SurfacesInstance()
       std::move(begin_frame_source), std::move(output_surface_holder),
       std::move(scheduler), std::move(texture_mailbox_deleter)));
   display_->Initialize(this, surface_manager_.get(),
-                       surface_id_allocator_->client_id());
+                       surface_id_allocator_->frame_sink_id());
   display_->SetVisible(true);
 
   surface_factory_.reset(new cc::SurfaceFactory(surface_manager_.get(), this));
@@ -90,12 +89,12 @@ SurfacesInstance::~SurfacesInstance() {
   if (!root_id_.is_null())
     surface_factory_->Destroy(root_id_);
 
-  surface_manager_->InvalidateSurfaceClientId(
-      surface_id_allocator_->client_id());
+  surface_manager_->InvalidateFrameSinkId(
+      surface_id_allocator_->frame_sink_id());
 }
 
-uint32_t SurfacesInstance::AllocateSurfaceClientId() {
-  return next_surface_client_id_++;
+cc::FrameSinkId SurfacesInstance::AllocateFrameSinkId() {
+  return cc::FrameSinkId(next_frame_sink_id_++, 0 /* sink_id */);
 }
 
 cc::SurfaceManager* SurfacesInstance::GetSurfaceManager() {