Replace usage of SurfaceId's client_id with FrameSinkId

android_webview/browser/surfaces_instance.h

Index: android_webview/browser/surfaces_instance.h
diff --git a/android_webview/browser/surfaces_instance.h b/android_webview/browser/surfaces_instance.h
index 99cacec4d52cb4b546f0dcb92739267b21487aad..53a7ddc659f3e7805c05ff553bc189d2d780cdd0 100644
--- a/android_webview/browser/surfaces_instance.h
+++ b/android_webview/browser/surfaces_instance.h
@@ -38,7 +38,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
  public:
   static scoped_refptr<SurfacesInstance> GetOrCreateInstance();
 
-  uint32_t AllocateSurfaceClientId();
+  cc::FrameSinkId AllocateFrameSinkId();
   cc::SurfaceManager* GetSurfaceManager();
 
   void DrawAndSwap(const gfx::Size& viewport,
@@ -69,7 +69,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
 
   void SetEmptyRootFrame();
 
-  uint32_t next_surface_client_id_;
+  uint32_t next_frame_sink_id_;
 
   std::unique_ptr<cc::SurfaceManager> surface_manager_;
   std::unique_ptr<cc::Display> display_;