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

cc/layers/surface_layer_impl_unittest.cc

Index: cc/layers/surface_layer_impl_unittest.cc
diff --git a/cc/layers/surface_layer_impl_unittest.cc b/cc/layers/surface_layer_impl_unittest.cc
index ea556d8dae165f109aa62c55536b2e1ab792abc7..7c0d76cb9d51953bbfbebfdabd07e2016d223bc1 100644
--- a/cc/layers/surface_layer_impl_unittest.cc
+++ b/cc/layers/surface_layer_impl_unittest.cc
@@ -17,8 +17,6 @@
 TEST(SurfaceLayerImplTest, Occlusion) {
   gfx::Size layer_size(1000, 1000);
   gfx::Size viewport_size(1000, 1000);
-  const LocalFrameId kArbitraryLocalFrameId(9,
-                                            base::UnguessableToken::Create());
 
   LayerTestCommon::LayerImplTest impl;
 
@@ -26,7 +24,7 @@
       impl.AddChildToRoot<SurfaceLayerImpl>();
   surface_layer_impl->SetBounds(layer_size);
   surface_layer_impl->SetDrawsContent(true);
-  SurfaceId surface_id(kArbitraryFrameSinkId, kArbitraryLocalFrameId);
+  SurfaceId surface_id(kArbitraryFrameSinkId, LocalFrameId(9, 1));
   surface_layer_impl->SetSurfaceId(surface_id);
   surface_layer_impl->SetSurfaceScale(1.f);
   surface_layer_impl->SetSurfaceSize(layer_size);