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

cc/surfaces/surface_manager_ref_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 <stddef.h>
 
 #include <unordered_map>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_sequence_generator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 constexpr FrameSinkId kFrameSink1(1, 0);
 constexpr FrameSinkId kFrameSink2(2, 0);
 constexpr FrameSinkId kFrameSink3(3, 0);
-const LocalFrameId kLocalFrame1(1, base::UnguessableToken::Create());
-const LocalFrameId kLocalFrame2(2, base::UnguessableToken::Create());
+constexpr LocalFrameId kLocalFrame1(1, 0);
+constexpr LocalFrameId kLocalFrame2(2, 0);
 
 // Tests for reference tracking in SurfaceManager.
 class SurfaceManagerRefTest : public testing::Test {
  public:
   SurfaceManager& manager() { return *manager_; }
 
   // Creates a new Surface with the provided SurfaceId. Will first create the
   // SurfaceFactory for |frame_sink_id| if necessary.
   SurfaceId CreateSurface(const FrameSinkId& frame_sink_id,
                           const LocalFrameId& local_frame_id) {
@@ skipping 204 matching lines @@
   manager().DidSatisfySequences(kFrameSink2, &satisfied);
   EXPECT_EQ(manager().GetSurfaceForId(id3), nullptr);
 
   // Remove ref on |id2| and delete during GC.
   manager().RemoveSurfaceReference(id1, id2);
   EXPECT_EQ(manager().GetSurfaceForId(id2), nullptr);
 }
 
 TEST_F(SurfaceManagerRefTest, TryAddReferenceToBadSurface) {
   // Not creating an accompanying Surface and SurfaceFactory.
-  SurfaceId id(FrameSinkId(100u, 200u),
-               LocalFrameId(1u, base::UnguessableToken::Create()));
+  SurfaceId id(FrameSinkId(100u, 200u), LocalFrameId(1u, 123123u));
 
   // Adding reference from root to the Surface should do nothing because
   // SurfaceManager doesn't know Surface for |id| exists.
   manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id), 0u);
 }
 
 TEST_F(SurfaceManagerRefTest, TryDoubleAddReference) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
@@ skipping 23 matching lines @@
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
 
   // Removing non-existent reference should be ignored.
   manager().AddSurfaceReference(id1, id2);
   manager().RemoveSurfaceReference(id2, id1);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 1u);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id2), 1u);
 }
 
 }  // namespace cc