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

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 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 "ui/compositor/layer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 1834 matching lines @@
   EXPECT_TRUE(child->cc_layer_for_testing());
   EXPECT_NE(before.get(), child->cc_layer_for_testing());
 }
 
 TEST_F(LayerWithDelegateTest, ExternalContentMirroring) {
   std::unique_ptr<Layer> layer(CreateLayer(LAYER_SOLID_COLOR));
 
   const auto satisfy_callback = base::Bind(&FakeSatisfyCallback);
   const auto require_callback = base::Bind(&FakeRequireCallback);
 
-  cc::SurfaceId surface_id(cc::FrameSinkId(0, 1), cc::LocalFrameId(2, 3));
+  cc::SurfaceId surface_id(
+      cc::FrameSinkId(0, 1),
+      cc::LocalFrameId(2, base::UnguessableToken::Create()));
   layer->SetShowSurface(surface_id, satisfy_callback, require_callback,
                         gfx::Size(10, 10), 1.0f, gfx::Size(10, 10));
 
   const auto mirror = layer->Mirror();
   auto* const cc_layer = mirror->cc_layer_for_testing();
   const auto* surface = static_cast<cc::SurfaceLayer*>(cc_layer);
 
   // Mirroring preserves surface state.
   EXPECT_EQ(surface_id, surface->surface_id());
   EXPECT_TRUE(satisfy_callback.Equals(surface->satisfy_callback()));
   EXPECT_TRUE(require_callback.Equals(surface->require_callback()));
   EXPECT_EQ(gfx::Size(10, 10), surface->surface_size());
   EXPECT_EQ(1.0f, surface->surface_scale());
 
-  surface_id = cc::SurfaceId(cc::FrameSinkId(1, 2), cc::LocalFrameId(3, 4));
+  surface_id =
+      cc::SurfaceId(cc::FrameSinkId(1, 2),
+                    cc::LocalFrameId(3, base::UnguessableToken::Create()));
   layer->SetShowSurface(surface_id, satisfy_callback, require_callback,
                         gfx::Size(20, 20), 2.0f, gfx::Size(20, 20));
 
   // A new cc::Layer should be created for the mirror.
   EXPECT_NE(cc_layer, mirror->cc_layer_for_testing());
   surface = static_cast<cc::SurfaceLayer*>(mirror->cc_layer_for_testing());
 
   // Surface updates propagate to the mirror.
   EXPECT_EQ(surface_id, surface->surface_id());
   EXPECT_EQ(gfx::Size(20, 20), surface->surface_size());
@@ skipping 358 matching lines @@
   root->SetOpacity(0.5f);
   WaitForSwap();
   EXPECT_EQ(1u, animation_observer.animation_step_count());
 
   EXPECT_FALSE(animation_observer.shutdown());
   ResetCompositor();
   EXPECT_TRUE(animation_observer.shutdown());
 }
 
 }  // namespace ui