Replace usage of SurfaceId's client_id with FrameSinkId

android_webview/browser/hardware_renderer.cc

Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index fdc5d70dc7a9b26fcdfef1eef1bf8d757f7d90cf..b951f94e0891262c2406aff2bbbf3d3cef6bceaf 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -28,14 +28,14 @@ HardwareRenderer::HardwareRenderer(RenderThreadManager* state)
       last_egl_context_(eglGetCurrentContext()),
       surfaces_(SurfacesInstance::GetOrCreateInstance()),
       surface_id_allocator_(
-          new cc::SurfaceIdAllocator(surfaces_->AllocateSurfaceClientId())),
+          new cc::SurfaceIdAllocator(surfaces_->AllocateFrameSinkId())),
       last_committed_compositor_frame_sink_id_(0u),
       last_submitted_compositor_frame_sink_id_(0u) {
   DCHECK(last_egl_context_);
-  surfaces_->GetSurfaceManager()->RegisterSurfaceClientId(
-      surface_id_allocator_->client_id());
+  surfaces_->GetSurfaceManager()->RegisterFrameSinkId(
+      surface_id_allocator_->frame_sink_id());
   surfaces_->GetSurfaceManager()->RegisterSurfaceFactoryClient(
-      surface_id_allocator_->client_id(), this);
+      surface_id_allocator_->frame_sink_id(), this);
 }
 
 HardwareRenderer::~HardwareRenderer() {
@@ -45,9 +45,9 @@ HardwareRenderer::~HardwareRenderer() {
     DestroySurface();
   surface_factory_.reset();
   surfaces_->GetSurfaceManager()->UnregisterSurfaceFactoryClient(
-      surface_id_allocator_->client_id());
-  surfaces_->GetSurfaceManager()->InvalidateSurfaceClientId(
-      surface_id_allocator_->client_id());
+      surface_id_allocator_->frame_sink_id());
+  surfaces_->GetSurfaceManager()->InvalidateFrameSinkId(
+      surface_id_allocator_->frame_sink_id());
 
   // Reset draw constraints.
   render_thread_manager_->PostExternalDrawConstraintsToChildCompositorOnRT(