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

cc/surfaces/surface_hittest_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
@@ skipping 54 matching lines @@
   EmptySurfaceFactoryClient client;
   FrameSinkId root_frame_sink_id(kArbitraryFrameSinkId);
   SurfaceFactory root_factory(root_frame_sink_id, &manager, &client);
 
   // Creates a root surface.
   gfx::Rect root_rect(300, 300);
   RenderPass* root_pass = nullptr;
   CompositorFrame root_frame = CreateCompositorFrame(root_rect, &root_pass);
 
   // Add a reference to a non-existant child surface on the root surface.
-  SurfaceId child_surface_id(kArbitraryFrameSinkId,
-                             LocalFrameId(0xdeadbeef, 0));
+  SurfaceId child_surface_id(
+      kArbitraryFrameSinkId,
+      LocalFrameId(0xdeadbeef, base::UnguessableToken::Create()));
   gfx::Rect child_rect(200, 200);
   CreateSurfaceDrawQuad(root_pass,
                         gfx::Transform(),
                         root_rect,
                         child_rect,
                         child_surface_id);
 
   // Submit the root frame.
   SurfaceIdAllocator root_allocator;
   LocalFrameId root_local_frame_id = root_allocator.GenerateId();
@@ skipping 537 matching lines @@
 
   // Verify that insets have affected hit targeting.
   EXPECT_EQ(0, accept_delegate.reject_target_overrides());
   EXPECT_EQ(2, accept_delegate.accept_target_overrides());
 
   root_factory.Destroy(root_local_frame_id);
   child_factory.Destroy(child_local_frame_id);
 }
 
 }  // namespace cc