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

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 2a74584e13b52851f1b44013fdfb09866fbcf488..54cc95987df9b691076fd4b1247a3f0eb58fc3bb 100644
--- a/cc/ipc/struct_traits_unittest.cc
+++ b/cc/ipc/struct_traits_unittest.cc
@@ -281,8 +281,7 @@
   std::vector<ui::LatencyInfo> latency_infos = {latency_info};
   std::vector<uint32_t> satisfies_sequences = {1234, 1337};
   std::vector<SurfaceId> referenced_surfaces;
-  SurfaceId id(FrameSinkId(1234, 4321),
-               LocalFrameId(5678, base::UnguessableToken::Create()));
+  SurfaceId id(FrameSinkId(1234, 4321), LocalFrameId(5678, 9101112));
   referenced_surfaces.push_back(id);
 
   CompositorFrameMetadata input;
@@ -434,9 +433,7 @@
   solid_quad->SetNew(sqs, rect2, rect2, color2, force_anti_aliasing_off);
 
   const gfx::Rect rect3(1029, 3847, 5610, 2938);
-  const SurfaceId surface_id(
-      FrameSinkId(1234, 4321),
-      LocalFrameId(5678, base::UnguessableToken::Create()));
+  const SurfaceId surface_id(FrameSinkId(1234, 4321), LocalFrameId(5678, 2468));
   SurfaceDrawQuad* surface_quad =
       render_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
   surface_quad->SetNew(sqs, rect3, rect3, surface_id);
@@ -609,8 +606,7 @@
   const gfx::Rect surface_quad_rect(1337, 2448, 1234, 5678);
   surface_quad->SetNew(
       shared_state_2, surface_quad_rect, surface_quad_rect,
-      SurfaceId(FrameSinkId(1337, 1234),
-                LocalFrameId(1234, base::UnguessableToken::Create())));
+      SurfaceId(FrameSinkId(1337, 1234), LocalFrameId(1234, 2468)));
 
   std::unique_ptr<RenderPass> output;
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
@@ -765,8 +761,7 @@
 
 TEST_F(StructTraitsTest, SurfaceId) {
   static constexpr FrameSinkId frame_sink_id(1337, 1234);
-  static LocalFrameId local_frame_id(0xfbadbeef,
-                                     base::UnguessableToken::Create());
+  static constexpr LocalFrameId local_frame_id(0xfbadbeef, 0xdeadbeef);
   SurfaceId input(frame_sink_id, local_frame_id);
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   SurfaceId output;