| Index: mojo/converters/surfaces/tests/surface_unittest.cc
|
| diff --git a/mojo/converters/surfaces/tests/surface_unittest.cc b/mojo/converters/surfaces/tests/surface_unittest.cc
|
| index f43b426965c5f01bdef39f002fcc00aa28a9e5cf..2f26c4cf01a1cbaaf92b36162ba7a379ac730ad2 100644
|
| --- a/mojo/converters/surfaces/tests/surface_unittest.cc
|
| +++ b/mojo/converters/surfaces/tests/surface_unittest.cc
|
| @@ -15,6 +15,7 @@
|
| #include "cc/resources/resource_provider.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| #include "gpu/command_buffer/common/mailbox_holder.h"
|
| +#include "gpu/command_buffer/common/sync_token.h"
|
| #include "mojo/converters/geometry/geometry_type_converters.h"
|
| #include "mojo/converters/surfaces/surfaces_type_converters.h"
|
| #include "mojo/converters/transform/transform_type_converters.h"
|
| @@ -407,7 +408,8 @@ TEST(SurfaceLibTest, MailboxHolder) {
|
| gpu::Mailbox mailbox;
|
| mailbox.Generate();
|
| uint32_t texture_target = GL_TEXTURE_2D;
|
| - gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, 1, 7u);
|
| + gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
|
| + gpu::CommandBufferId::FromUnsafeValue(1), 7u);
|
| sync_token.SetVerifyFlush();
|
| gpu::MailboxHolder holder(mailbox, sync_token, texture_target);
|
|
|
| @@ -459,7 +461,8 @@ TEST(SurfaceLibTest, TransferableResource) {
|
|
|
| TEST(SurfaceLibTest, ReturnedResource) {
|
| uint32_t id = 5u;
|
| - gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, 1, 24u);
|
| + gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
|
| + gpu::CommandBufferId::FromUnsafeValue(1), 24u);
|
| sync_token.SetVerifyFlush();
|
| int count = 2;
|
| bool lost = false;
|
|
|