Index: cc/surfaces/surface_factory_unittest.cc |
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc |
index 48e007cb04dc7e9e00b2aa847e390c6244815439..d2b5520d06d2ae74b93762229a678f3f37794ced 100644 |
--- a/cc/surfaces/surface_factory_unittest.cc |
+++ b/cc/surfaces/surface_factory_unittest.cc |
@@ -66,7 +66,7 @@ class SurfaceFactoryTest : public testing::Test { |
public: |
SurfaceFactoryTest() |
: factory_(new SurfaceFactory(&manager_, &client_)), |
- surface_id_(3), |
+ surface_id_(0, 0, 3), |
frame_sync_token_(GenTestSyncToken(4)), |
consumer_sync_token_(GenTestSyncToken(5)) { |
factory_->Create(surface_id_); |
@@ -412,7 +412,7 @@ TEST_F(SurfaceFactoryTest, ResourceLifetime) { |
} |
TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) { |
- SurfaceId surface_id(6); |
+ SurfaceId surface_id(0, 0, 6); |
factory_->Create(surface_id); |
Surface* surface = manager_.GetSurfaceForId(surface_id); |
ASSERT_NE(nullptr, surface); |
@@ -435,7 +435,7 @@ void DrawCallback(uint32_t* execute_count, |
// Tests doing a DestroyAll before shutting down the factory; |
TEST_F(SurfaceFactoryTest, DestroyAll) { |
- SurfaceId id(7); |
+ SurfaceId id(0, 0, 7); |
factory_->Create(id); |
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
@@ -458,7 +458,7 @@ TEST_F(SurfaceFactoryTest, DestroyAll) { |
} |
TEST_F(SurfaceFactoryTest, DestroySequence) { |
- SurfaceId id2(5); |
+ SurfaceId id2(0, 0, 5); |
factory_->Create(id2); |
manager_.RegisterSurfaceIdNamespace(0); |
@@ -491,7 +491,7 @@ TEST_F(SurfaceFactoryTest, DestroySequence) { |
// Sequences to be ignored. |
TEST_F(SurfaceFactoryTest, InvalidIdNamespace) { |
uint32_t id_namespace = 9u; |
- SurfaceId id(5); |
+ SurfaceId id(id_namespace, 0, 5); |
factory_->Create(id); |
manager_.RegisterSurfaceIdNamespace(id_namespace); |
@@ -510,7 +510,7 @@ TEST_F(SurfaceFactoryTest, InvalidIdNamespace) { |
} |
TEST_F(SurfaceFactoryTest, DestroyCycle) { |
- SurfaceId id2(5); |
+ SurfaceId id2(0, 0, 5); |
factory_->Create(id2); |
manager_.RegisterSurfaceIdNamespace(0); |