Replace usage of SurfaceId's client_id with FrameSinkId

cc/layers/surface_layer_unittest.cc

Index: cc/layers/surface_layer_unittest.cc
diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc
index 8a9bd76e1848dd1a2e9535cf3acc0c7149be0e57..967fdebbc65eb9676be1e0028d4765b380e957db 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_unittest.cc
@@ -26,7 +26,7 @@
 namespace cc {
 namespace {
 
-static constexpr uint32_t kArbitraryClientId = 0;
+static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 
 class SurfaceLayerTest : public testing::Test {
  protected:
@@ -72,9 +72,10 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
   scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, &blank_change),
       base::Bind(&RequireCallback, &required_id, &required_seq)));
-  layer->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
+  layer->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId, 1, 0), 1.f,
                       gfx::Size(1, 1));
-  layer_tree_host_->GetSurfaceSequenceGenerator()->set_surface_client_id(1);
+  layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id(
+      FrameSinkId(1, 1));
   layer_tree_->SetRootLayer(layer);
 
   std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 =
@@ -82,16 +83,17 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
   scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, &blank_change),
       base::Bind(&RequireCallback, &required_id, &required_seq)));
-  layer2->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
+  layer2->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId, 1, 0), 1.f,
                        gfx::Size(1, 1));
-  layer_tree_host2->GetSurfaceSequenceGenerator()->set_surface_client_id(2);
+  layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id(
+      FrameSinkId(2, 2));
   layer_tree_host2->SetRootLayer(layer2);
 
   // Layers haven't been removed, so no sequence should be satisfied.
   EXPECT_TRUE(blank_change.is_null());
 
-  SurfaceSequence expected1(1u, 1u);
-  SurfaceSequence expected2(2u, 1u);
+  SurfaceSequence expected1(FrameSinkId(1, 1), 1u);
+  SurfaceSequence expected2(FrameSinkId(2, 2), 1u);
 
   layer_tree_host2->SetRootLayer(nullptr);
   layer_tree_host2.reset();
@@ -102,7 +104,7 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
 
   // Set of sequences that need to be satisfied should include sequences from
   // both trees.
-  EXPECT_TRUE(required_id == SurfaceId(kArbitraryClientId, 1, 0));
+  EXPECT_TRUE(required_id == SurfaceId(kArbitraryFrameSinkId, 1, 0));
   EXPECT_EQ(2u, required_seq.size());
   EXPECT_TRUE(required_seq.count(expected1));
   EXPECT_TRUE(required_seq.count(expected2));
@@ -126,11 +128,12 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
       : commit_count_(0), sequence_was_satisfied_(false) {}
 
   void BeginTest() override {
-    layer_tree_host()->GetSurfaceSequenceGenerator()->set_surface_client_id(1);
+    layer_tree_host()->GetSurfaceSequenceGenerator()->set_frame_sink_id(
+        FrameSinkId(1, 1));
     layer_ = SurfaceLayer::Create(
         base::Bind(&SatisfyCallback, &satisfied_sequence_),
         base::Bind(&RequireCallback, &required_id_, &required_set_));
-    layer_->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
+    layer_->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId, 1, 0), 1.f,
                          gfx::Size(1, 1));
 
     // Layer hasn't been added to tree so no SurfaceSequence generated yet.
@@ -139,8 +142,8 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
     layer_tree()->SetRootLayer(layer_);
 
     // Should have SurfaceSequence from first tree.
-    SurfaceSequence expected(1u, 1u);
-    EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryClientId, 1, 0));
+    SurfaceSequence expected(kArbitraryFrameSinkId, 1u);
+    EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, 1, 0));
     EXPECT_EQ(1u, required_set_.size());
     EXPECT_TRUE(required_set_.count(expected));
 
@@ -207,7 +210,7 @@ class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
   }
 
   void AfterTest() override {
-    EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryClientId, 1, 0));
+    EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, 1, 0));
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied through Swap, not with the
     // callback.
@@ -246,10 +249,11 @@ class SurfaceLayerSwapPromiseWithoutDraw : public SurfaceLayerSwapPromise {
   }
 
   void AfterTest() override {
-    EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryClientId, 1, 0));
+    EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, 1, 0));
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied with the callback.
-    EXPECT_TRUE(satisfied_sequence_ == SurfaceSequence(1u, 1u));
+    EXPECT_TRUE(satisfied_sequence_ ==
+                SurfaceSequence(kArbitraryFrameSinkId, 1u));
   }
 };