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

services/ui/ws/frame_generator_unittest.cc

 // Copyright 2016 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 "services/ui/ws/frame_generator.h"
 
 #include <memory>
 
 #include "base/test/test_message_loop.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/platform_display_init_params.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/test_server_window_delegate.h"
 #include "services/ui/ws/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 namespace {
 
 // Typical id for the display root ServerWindow.
 constexpr WindowId kRootDisplayId(0, 2);
-const base::UnguessableToken kArbitraryToken = base::UnguessableToken::Create();
 
 // Makes the window visible and creates the default surface for it.
 void InitWindow(ServerWindow* window) {
   window->SetVisible(true);
   ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager =
       window->GetOrCreateCompositorFrameSinkManager();
   compositor_frame_sink_manager->SetLatestSurfaceInfo(
       mojom::CompositorFrameSinkType::DEFAULT,
       cc::SurfaceId(
           cc::FrameSinkId(
               WindowIdToTransportId(window->id()),
               static_cast<uint32_t>(mojom::CompositorFrameSinkType::DEFAULT)),
-          cc::LocalFrameId(1u, kArbitraryToken)),
+          cc::LocalFrameId(1u, 1u)),
       gfx::Size(100, 100));
 }
 
 }  // namespace
 
 class FrameGeneratorTest : public testing::Test {
  public:
   FrameGeneratorTest()
       : root_window_(base::MakeUnique<ServerWindow>(&window_delegate_,
                                                     kRootDisplayId)) {}
@@ skipping 68 matching lines @@
   EXPECT_EQ(child_opacity * root_opacity, child_sqs->opacity);
 
   // Pretend to create the UNDERLAY Surface for the child window, and confirm
   // that this creates an extra SharedQuadState in the CompositorFrame.
   child_window.GetOrCreateCompositorFrameSinkManager()->SetLatestSurfaceInfo(
       mojom::CompositorFrameSinkType::UNDERLAY,
       cc::SurfaceId(
           cc::FrameSinkId(
               WindowIdToTransportId(child_window.id()),
               static_cast<uint32_t>(mojom::CompositorFrameSinkType::UNDERLAY)),
-          cc::LocalFrameId(1u, kArbitraryToken)),
+          cc::LocalFrameId(1u, 1u)),
       gfx::Size(100, 100));
 
   render_pass = cc::RenderPass::Create();
   DrawWindowTree(render_pass.get());
   quad_state_list = &render_pass->shared_quad_state_list;
   EXPECT_EQ(3u, quad_state_list->size());
   auto it = quad_state_list->begin();
   EXPECT_EQ(child_opacity * root_opacity, (*it)->opacity);
   EXPECT_EQ(child_opacity * root_opacity, (*++it)->opacity);
   EXPECT_EQ(root_opacity, (*++it)->opacity);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui