Replace usage of SurfaceId's client_id with FrameSinkId

cc/ipc/struct_traits_unittest.cc

Index: cc/ipc/struct_traits_unittest.cc
diff --git a/cc/ipc/struct_traits_unittest.cc b/cc/ipc/struct_traits_unittest.cc
index 22e6d49340e7607edf770eb0bfdcc307ee7d79f8..4bd22bda35e428466f77c667409d0fca036adefb 100644
--- a/cc/ipc/struct_traits_unittest.cc
+++ b/cc/ipc/struct_traits_unittest.cc
@@ -286,7 +286,7 @@ TEST_F(StructTraitsTest, CompositorFrameMetadata) {
   std::vector<ui::LatencyInfo> latency_infos = {latency_info};
   std::vector<uint32_t> satisfies_sequences = {1234, 1337};
   std::vector<SurfaceId> referenced_surfaces;
-  SurfaceId id(1234, 5678, 9101112);
+  SurfaceId id(FrameSinkId(1234, 4321), 5678, 9101112);
   referenced_surfaces.push_back(id);
 
   CompositorFrameMetadata input;
@@ -438,7 +438,7 @@ TEST_F(StructTraitsTest, QuadListBasic) {
   solid_quad->SetNew(sqs, rect2, rect2, color2, force_anti_aliasing_off);
 
   const gfx::Rect rect3(1029, 3847, 5610, 2938);
-  const SurfaceId surface_id(1234, 5678, 2468);
+  const SurfaceId surface_id(FrameSinkId(1234, 4321), 5678, 2468);
   SurfaceDrawQuad* surface_quad =
       render_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   surface_quad->SetNew(sqs, rect3, rect3, surface_id);
@@ -610,7 +610,7 @@ TEST_F(StructTraitsTest, RenderPass) {
       input->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   const gfx::Rect surface_quad_rect(1337, 2448, 1234, 5678);
   surface_quad->SetNew(shared_state_2, surface_quad_rect, surface_quad_rect,
-                       SurfaceId(1337, 1234, 2468));
+                       SurfaceId(FrameSinkId(1337, 1234), 1234, 2468));
 
   std::unique_ptr<RenderPass> output;
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
@@ -764,26 +764,26 @@ TEST_F(StructTraitsTest, Selection) {
 }
 
 TEST_F(StructTraitsTest, SurfaceId) {
-  const uint32_t client_id = 1337;
+  static constexpr FrameSinkId frame_sink_id(1337, 1234);
   const uint32_t local_id = 0xfbadbeef;
   const uint64_t nonce = 0xdeadbeef;
-  SurfaceId input(client_id, local_id, nonce);
+  SurfaceId input(frame_sink_id, local_id, nonce);
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   SurfaceId output;
   proxy->EchoSurfaceId(input, &output);
-  EXPECT_EQ(client_id, output.client_id());
+  EXPECT_EQ(frame_sink_id, output.frame_sink_id());
   EXPECT_EQ(local_id, output.local_id());
   EXPECT_EQ(nonce, output.nonce());
 }
 
 TEST_F(StructTraitsTest, SurfaceSequence) {
-  const uint32_t client_id = 2016;
+  const FrameSinkId frame_sink_id(2016, 1234);
   const uint32_t sequence = 0xfbadbeef;
-  SurfaceSequence input(client_id, sequence);
+  SurfaceSequence input(frame_sink_id, sequence);
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   SurfaceSequence output;
   proxy->EchoSurfaceSequence(input, &output);
-  EXPECT_EQ(client_id, output.client_id);
+  EXPECT_EQ(frame_sink_id, output.frame_sink_id);
   EXPECT_EQ(sequence, output.sequence);
 }