Replace usage of SurfaceId's client_id with FrameSinkId

ui/android/delegated_frame_host_android.cc

Index: ui/android/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index f82e92576b52936425763e7c1046b6e5a4a98c55..5c6b10fa1cb8278f790c5de1d7bc6fe8e84173b5 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -28,7 +28,7 @@ void SatisfyCallback(cc::SurfaceManager* manager,
                      const cc::SurfaceSequence& sequence) {
   std::vector<uint32_t> sequences;
   sequences.push_back(sequence.sequence);
-  manager->DidSatisfySequences(sequence.client_id, &sequences);
+  manager->DidSatisfySequences(sequence.frame_sink_id, &sequences);
 }
 
 void RequireCallback(cc::SurfaceManager* manager,
@@ -82,8 +82,8 @@ DelegatedFrameHostAndroid::DelegatedFrameHostAndroid(
   surface_manager_ =
       ui::ContextProviderFactory::GetInstance()->GetSurfaceManager();
   surface_id_allocator_.reset(new cc::SurfaceIdAllocator(
-      ui::ContextProviderFactory::GetInstance()->AllocateSurfaceClientId()));
-  surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
+      ui::ContextProviderFactory::GetInstance()->AllocateFrameSinkId()));
+  surface_manager_->RegisterFrameSinkId(surface_id_allocator_->frame_sink_id());
 
   background_layer_->SetBackgroundColor(background_color);
   view_->GetLayer()->AddChild(background_layer_);
@@ -93,8 +93,8 @@ DelegatedFrameHostAndroid::DelegatedFrameHostAndroid(
 DelegatedFrameHostAndroid::~DelegatedFrameHostAndroid() {
   DestroyDelegatedContent();
   surface_factory_.reset();
-  surface_manager_->InvalidateSurfaceClientId(
-      surface_id_allocator_->client_id());
+  surface_manager_->InvalidateFrameSinkId(
+      surface_id_allocator_->frame_sink_id());
   background_layer_->RemoveFromParent();
 }
 
@@ -158,8 +158,8 @@ void DelegatedFrameHostAndroid::SubmitCompositorFrame(
                                           std::move(frame), draw_callback);
 }
 
-uint32_t DelegatedFrameHostAndroid::GetSurfaceClientId() const {
-  return surface_id_allocator_->client_id();
+cc::FrameSinkId DelegatedFrameHostAndroid::GetFrameSinkId() const {
+  return surface_id_allocator_->frame_sink_id();
 }
 
 void DelegatedFrameHostAndroid::RequestCopyOfSurface(