Index: cc/surfaces/surface_aggregator_unittest.cc |
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc |
index 0ee7a84ebb7e441ce31a71b5ce3bcfd6b6b8f932..8dfbd080584a8fd831cace403c56508ad04282da 100644 |
--- a/cc/surfaces/surface_aggregator_unittest.cc |
+++ b/cc/surfaces/surface_aggregator_unittest.cc |
@@ -36,9 +36,12 @@ namespace { |
static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1); |
static constexpr FrameSinkId kArbitraryChildFrameSinkId(2, 2); |
+static const base::UnguessableToken kArbitraryToken = |
+ base::UnguessableToken::Create(); |
SurfaceId InvalidSurfaceId() { |
- static SurfaceId invalid(kArbitraryFrameSinkId, LocalFrameId(0xdeadbeef, 0)); |
+ static SurfaceId invalid(kArbitraryFrameSinkId, |
+ LocalFrameId(0xdeadbeef, kArbitraryToken)); |
return invalid; |
} |
@@ -79,7 +82,7 @@ class SurfaceAggregatorTest : public testing::Test { |
}; |
TEST_F(SurfaceAggregatorTest, ValidSurfaceNoFrame) { |
- LocalFrameId local_frame_id(7, 0); |
+ LocalFrameId local_frame_id(7, base::UnguessableToken::Create()); |
SurfaceId one_id(kArbitraryFrameSinkId, local_frame_id); |
factory_.Create(local_frame_id); |
@@ -1793,7 +1796,7 @@ void SubmitCompositorFrameWithResources(ResourceId* resource_ids, |
TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) { |
ResourceTrackingSurfaceFactoryClient client; |
SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client); |
- LocalFrameId local_frame_id(7u, 0); |
+ LocalFrameId local_frame_id(7u, base::UnguessableToken::Create()); |
SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id); |
factory.Create(local_frame_id); |
@@ -1824,7 +1827,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) { |
TEST_F(SurfaceAggregatorWithResourcesTest, TakeInvalidResources) { |
ResourceTrackingSurfaceFactoryClient client; |
SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client); |
- LocalFrameId local_frame_id(7u, 0); |
+ LocalFrameId local_frame_id(7u, base::UnguessableToken::Create()); |
SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id); |
factory.Create(local_frame_id); |
@@ -1857,11 +1860,11 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TakeInvalidResources) { |
TEST_F(SurfaceAggregatorWithResourcesTest, TwoSurfaces) { |
ResourceTrackingSurfaceFactoryClient client; |
SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client); |
- LocalFrameId local_frame1_id(7u, 0); |
+ LocalFrameId local_frame1_id(7u, base::UnguessableToken::Create()); |
SurfaceId surface1_id(kArbitraryFrameSinkId, local_frame1_id); |
factory.Create(local_frame1_id); |
- LocalFrameId local_frame2_id(8u, 0); |
+ LocalFrameId local_frame2_id(8u, base::UnguessableToken::Create()); |
SurfaceId surface2_id(kArbitraryFrameSinkId, local_frame2_id); |
factory.Create(local_frame2_id); |
@@ -1900,13 +1903,13 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TwoSurfaces) { |
TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) { |
ResourceTrackingSurfaceFactoryClient client; |
SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client); |
- LocalFrameId root_local_frame_id(7u, 1); |
+ LocalFrameId root_local_frame_id(7u, kArbitraryToken); |
SurfaceId root_surface_id(kArbitraryFrameSinkId, root_local_frame_id); |
factory.Create(root_local_frame_id); |
- LocalFrameId middle_local_frame_id(8u, 1); |
+ LocalFrameId middle_local_frame_id(8u, kArbitraryToken); |
SurfaceId middle_surface_id(kArbitraryFrameSinkId, middle_local_frame_id); |
factory.Create(middle_local_frame_id); |
- LocalFrameId child_local_frame_id(9u, 1); |
+ LocalFrameId child_local_frame_id(9u, kArbitraryToken); |
SurfaceId child_surface_id(kArbitraryFrameSinkId, child_local_frame_id); |
factory.Create(child_local_frame_id); |
@@ -1950,11 +1953,11 @@ TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) { |
TEST_F(SurfaceAggregatorWithResourcesTest, SecureOutputTexture) { |
ResourceTrackingSurfaceFactoryClient client; |
SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client); |
- LocalFrameId local_frame1_id(7u, 0); |
+ LocalFrameId local_frame1_id(7u, base::UnguessableToken::Create()); |
SurfaceId surface1_id(kArbitraryFrameSinkId, local_frame1_id); |
factory.Create(local_frame1_id); |
- LocalFrameId local_frame2_id(8u, 0); |
+ LocalFrameId local_frame2_id(8u, base::UnguessableToken::Create()); |
SurfaceId surface2_id(kArbitraryFrameSinkId, local_frame2_id); |
factory.Create(local_frame2_id); |