Replace usage of SurfaceId's client_id with FrameSinkId

cc/ipc/surface_id.mojom

Index: cc/ipc/surface_id.mojom
diff --git a/cc/ipc/surface_id.mojom b/cc/ipc/surface_id.mojom
index 0a0e5fa903fadeef752b8a411f9687da5b54c6c0..32db3188156da8a0cc1ca4cf179dd10fe79b291b 100644
--- a/cc/ipc/surface_id.mojom
+++ b/cc/ipc/surface_id.mojom
@@ -4,6 +4,8 @@
 
 module cc.mojom;
 
+import "cc/ipc/frame_sink_id.mojom";
+
 // A surface ID is composed of three parts: a client ID, a local ID, and a
 // nonce. The local part and nonce are allocated by the client using any scheme
 // that avoids duplicates and makes IDs unguessable respectively. The client ID
@@ -15,8 +17,7 @@ module cc.mojom;
 // client. The actual client ID must be used to pass surface ids to other
 // clients for them to reference.
 struct SurfaceId {
-  // A service allocated ID identifying a client.
-  uint32 client_id;
+  FrameSinkId frame_sink_id;
 
   // An identifier allocated by the client uniquely identifying a surface within
   // a client process.