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);
-constexpr LocalFrameId kLocalFrame1(1, 0);
-constexpr LocalFrameId kLocalFrame2(2, 0);
+const LocalFrameId kLocalFrame1(1, base::UnguessableToken::Create());
+const LocalFrameId kLocalFrame2(2, base::UnguessableToken::Create());
 
 // 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 29 matching lines @@
                      std::unique_ptr<SurfaceFactory>,
                      FrameSinkIdHash>
       factories_;
   std::unique_ptr<SurfaceManager> manager_;
 };
 
 }  // namespace
 
 TEST_F(SurfaceManagerRefTest, AddReference) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
 
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id1), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 0u);
 }
 
 TEST_F(SurfaceManagerRefTest, AddRemoveReference) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
 
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id1), 1u);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id2), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id2), 0u);
 
   manager().RemoveSurfaceReference(id1, id2);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id1), 1u);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id2), 0u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 0u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id2), 0u);
 }
 
 TEST_F(SurfaceManagerRefTest, AddRemoveReferenceRecursive) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
   SurfaceId id3 = CreateSurface(kFrameSink3, kLocalFrame1);
 
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
   manager().AddSurfaceReference(id2, id3);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id1), 1u);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id2), 1u);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id3), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id2), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id3), 0u);
 
   // Should remove reference from id1 -> id2 and then since id2 has zero
   // references all references it holds should be removed.
   manager().RemoveSurfaceReference(id1, id2);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id1), 1u);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id2), 0u);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id3), 0u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 0u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id2), 0u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id3), 0u);
 }
 
 TEST_F(SurfaceManagerRefTest, NewSurfaceFromFrameSink) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
   SurfaceId id3 = CreateSurface(kFrameSink3, kLocalFrame1);
 
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
   manager().AddSurfaceReference(id2, id3);
 
   // |kFramesink2| received a CompositorFrame with a new size, so it destroys
   // |id2| and creates |id2_next|. No reference have been removed yet.
   DestroySurface(id2);
   SurfaceId id2_next = CreateSurface(kFrameSink2, kLocalFrame2);
   EXPECT_NE(manager().GetSurfaceForId(id2), nullptr);
   EXPECT_NE(manager().GetSurfaceForId(id2_next), nullptr);
 
@@ skipping 12 matching lines @@
   // |id2| should be deleted during GC but other surfaces shouldn't.
   EXPECT_EQ(manager().GetSurfaceForId(id2), nullptr);
   EXPECT_NE(manager().GetSurfaceForId(id2_next), nullptr);
   EXPECT_NE(manager().GetSurfaceForId(id3), nullptr);
 }
 
 TEST_F(SurfaceManagerRefTest, CheckGC) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
 
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
 
   EXPECT_NE(manager().GetSurfaceForId(id1), nullptr);
   EXPECT_NE(manager().GetSurfaceForId(id2), nullptr);
 
   // Destroying the surfaces shouldn't delete them yet, since there is still an
   // active reference on all surfaces.
   DestroySurface(id1);
   DestroySurface(id2);
   EXPECT_NE(manager().GetSurfaceForId(id1), nullptr);
   EXPECT_NE(manager().GetSurfaceForId(id2), nullptr);
 
   // Should delete |id2| when the only reference to it is removed.
   manager().RemoveSurfaceReference(id1, id2);
   EXPECT_EQ(manager().GetSurfaceForId(id2), nullptr);
 
   // Should delete |id1| when the only reference to it is removed.
-  manager().RemoveSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
   EXPECT_EQ(manager().GetSurfaceForId(id1), nullptr);
 }
 
 TEST_F(SurfaceManagerRefTest, CheckGCRecusiveFull) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
   SurfaceId id3 = CreateSurface(kFrameSink3, kLocalFrame1);
 
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
   manager().AddSurfaceReference(id2, id3);
 
   DestroySurface(id3);
   DestroySurface(id2);
   DestroySurface(id1);
 
   // Destroying the surfaces shouldn't delete them yet, since there is still an
   // active reference on all surfaces.
   EXPECT_NE(manager().GetSurfaceForId(id3), nullptr);
   EXPECT_NE(manager().GetSurfaceForId(id2), nullptr);
   EXPECT_NE(manager().GetSurfaceForId(id1), nullptr);
 
-  manager().RemoveSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
 
   // Removing the reference from the root to id1 should allow all three surfaces
   // to be deleted during GC.
   EXPECT_EQ(manager().GetSurfaceForId(id1), nullptr);
   EXPECT_EQ(manager().GetSurfaceForId(id2), nullptr);
   EXPECT_EQ(manager().GetSurfaceForId(id3), nullptr);
 }
 
 TEST_F(SurfaceManagerRefTest, CheckGCWithSequences) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
 
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
 
   SurfaceId id3 = CreateSurface(kFrameSink3, kLocalFrame1);
   Surface* surface3 = manager().GetSurfaceForId(id3);
 
   // Add destruction dependency from |id2| to |id3|.
   manager().RegisterFrameSinkId(kFrameSink2);
   SurfaceSequence sequence(kFrameSink2, 1u);
   surface3->AddDestructionDependency(sequence);
   EXPECT_EQ(surface3->GetDestructionDependencyCount(), 1u);
@@ skipping 12 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, 123123u));
+  SurfaceId id(FrameSinkId(100u, 200u),
+               LocalFrameId(1u, base::UnguessableToken::Create()));
 
   // Adding reference from root to the Surface should do nothing because
   // SurfaceManager doesn't know Surface for |id| exists.
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id), 0u);
 }
 
 TEST_F(SurfaceManagerRefTest, TryDoubleAddReference) {
   SurfaceId id1 = CreateSurface(kFrameSink1, kLocalFrame1);
   SurfaceId id2 = CreateSurface(kFrameSink2, kLocalFrame1);
 
-  manager().AddSurfaceReference(SurfaceManager::kRootSurfaceId, id1);
+  manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id2), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 1u);
 
   // The second request should be ignored without crashing.
   manager().AddSurfaceReference(id1, id2);
   EXPECT_EQ(manager().GetSurfaceReferenceCount(id2), 1u);
   EXPECT_EQ(manager().GetReferencedSurfaceCount(id1), 1u);
 }
 
@@ skipping 11 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