Index: cc/surfaces/surface_factory_unittest.cc |
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc |
index fe6b408b45c2f2155e933ce2a4121b8c655ceff0..6592fcbfbb3035d2c69a20ae44aed309308a4e76 100644 |
--- a/cc/surfaces/surface_factory_unittest.cc |
+++ b/cc/surfaces/surface_factory_unittest.cc |
@@ -27,8 +27,6 @@ |
static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1); |
static constexpr FrameSinkId kAnotherArbitraryFrameSinkId(2, 2); |
-static const base::UnguessableToken kArbitraryToken = |
- base::UnguessableToken::Create(); |
class TestSurfaceFactoryClient : public SurfaceFactoryClient { |
public: |
@@ -71,7 +69,7 @@ |
SurfaceFactoryTest() |
: factory_( |
new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_)), |
- local_frame_id_(3, kArbitraryToken), |
+ local_frame_id_(3, 1), |
frame_sync_token_(GenTestSyncToken(4)), |
consumer_sync_token_(GenTestSyncToken(5)) { |
manager_.AddObserver(this); |
@@ -435,7 +433,7 @@ |
} |
TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) { |
- LocalFrameId local_frame_id(6, kArbitraryToken); |
+ LocalFrameId local_frame_id(6, 1); |
SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id); |
factory_->Create(local_frame_id); |
Surface* surface = manager_.GetSurfaceForId(surface_id); |
@@ -451,14 +449,14 @@ |
void CreateSurfaceDrawCallback(SurfaceFactory* factory, |
uint32_t* execute_count) { |
- LocalFrameId new_id(7, base::UnguessableToken::Create()); |
+ LocalFrameId new_id(7, 0); |
factory->Create(new_id); |
factory->Destroy(new_id); |
*execute_count += 1; |
} |
TEST_F(SurfaceFactoryTest, AddDuringDestroy) { |
- LocalFrameId local_frame_id(6, kArbitraryToken); |
+ LocalFrameId local_frame_id(6, 1); |
factory_->Create(local_frame_id); |
uint32_t execute_count = 0; |
@@ -477,7 +475,7 @@ |
// Tests doing a DestroyAll before shutting down the factory; |
TEST_F(SurfaceFactoryTest, DestroyAll) { |
- LocalFrameId id(7, kArbitraryToken); |
+ LocalFrameId id(7, 1); |
factory_->Create(id); |
TransferableResource resource; |
@@ -496,7 +494,7 @@ |
// Tests that SurfaceFactory doesn't return resources after Reset(). |
TEST_F(SurfaceFactoryTest, Reset) { |
- LocalFrameId id(7, kArbitraryToken); |
+ LocalFrameId id(7, 0); |
factory_->Create(id); |
TransferableResource resource; |
@@ -519,7 +517,7 @@ |
} |
TEST_F(SurfaceFactoryTest, DestroySequence) { |
- LocalFrameId local_frame_id2(5, kArbitraryToken); |
+ LocalFrameId local_frame_id2(5, 1); |
SurfaceId id2(kArbitraryFrameSinkId, local_frame_id2); |
factory_->Create(local_frame_id2); |
@@ -553,7 +551,7 @@ |
TEST_F(SurfaceFactoryTest, InvalidFrameSinkId) { |
FrameSinkId frame_sink_id(1234, 5678); |
- LocalFrameId local_frame_id(5, kArbitraryToken); |
+ LocalFrameId local_frame_id(5, 1); |
SurfaceId id(factory_->frame_sink_id(), local_frame_id); |
factory_->Create(local_frame_id); |
@@ -573,7 +571,7 @@ |
} |
TEST_F(SurfaceFactoryTest, DestroyCycle) { |
- LocalFrameId local_frame_id2(5, kArbitraryToken); |
+ LocalFrameId local_frame_id2(5, 1); |
SurfaceId id2(kArbitraryFrameSinkId, local_frame_id2); |
factory_->Create(local_frame_id2); |