Replaced cc::SurfaceId::nonce_ with base::UnguessableToken

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 3ed3d7e8e6127bdb29396d63d608c771aa87c87b..6d078962eb8dc1f7d48a375916644e0b26e7032f 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_unittest.cc
@@ -73,8 +73,9 @@ 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(kArbitraryFrameSinkId, LocalFrameId(1, 0)), 1.f,
-                      gfx::Size(1, 1));
+  layer->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId,
+                                LocalFrameId(1, base::UnguessableToken())),
+                      1.f, gfx::Size(1, 1));
   layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id(
       FrameSinkId(1, 1));
   layer_tree_->SetRootLayer(layer);
@@ -84,7 +85,8 @@ 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(kArbitraryFrameSinkId, LocalFrameId(1, 0)),
+  layer2->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId,
+                                 LocalFrameId(1, base::UnguessableToken())),
                        1.f, gfx::Size(1, 1));
   layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id(
       FrameSinkId(2, 2));
@@ -106,7 +108,8 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
   // Set of sequences that need to be satisfied should include sequences from
   // both trees.
   EXPECT_TRUE(required_id ==
-              SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)));
+              SurfaceId(kArbitraryFrameSinkId,
+                        LocalFrameId(1, base::UnguessableToken())));
   EXPECT_EQ(2u, required_seq.size());
   EXPECT_TRUE(required_seq.count(expected1));
   EXPECT_TRUE(required_seq.count(expected2));
@@ -135,7 +138,8 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
     layer_ = SurfaceLayer::Create(
         base::Bind(&SatisfyCallback, &satisfied_sequence_),
         base::Bind(&RequireCallback, &required_id_, &required_set_));
-    layer_->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)),
+    layer_->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId,
+                                   LocalFrameId(1, base::UnguessableToken())),
                          1.f, gfx::Size(1, 1));
 
     // Layer hasn't been added to tree so no SurfaceSequence generated yet.
@@ -146,7 +150,8 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
     // Should have SurfaceSequence from first tree.
     SurfaceSequence expected(kArbitraryFrameSinkId, 1u);
     EXPECT_TRUE(required_id_ ==
-                SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)));
+                SurfaceId(kArbitraryFrameSinkId,
+                          LocalFrameId(1, base::UnguessableToken())));
     EXPECT_EQ(1u, required_set_.size());
     EXPECT_TRUE(required_set_.count(expected));
 
@@ -214,7 +219,8 @@ class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
 
   void AfterTest() override {
     EXPECT_TRUE(required_id_ ==
-                SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)));
+                SurfaceId(kArbitraryFrameSinkId,
+                          LocalFrameId(1, base::UnguessableToken())));
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied through Swap, not with the
     // callback.
@@ -254,7 +260,8 @@ class SurfaceLayerSwapPromiseWithoutDraw : public SurfaceLayerSwapPromise {
 
   void AfterTest() override {
     EXPECT_TRUE(required_id_ ==
-                SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)));
+                SurfaceId(kArbitraryFrameSinkId,
+                          LocalFrameId(1, base::UnguessableToken())));
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied with the callback.
     EXPECT_TRUE(satisfied_sequence_ ==