| Index: cc/surfaces/surface_display_output_surface_unittest.cc
|
| diff --git a/cc/surfaces/surface_display_output_surface_unittest.cc b/cc/surfaces/surface_display_output_surface_unittest.cc
|
| index 27de2b972f73bcaf8bd700d3710b25888d9fec09..598a982cc8f90473e5b044fc5a4f04146ac900f6 100644
|
| --- a/cc/surfaces/surface_display_output_surface_unittest.cc
|
| +++ b/cc/surfaces/surface_display_output_surface_unittest.cc
|
| @@ -25,16 +25,18 @@
|
| namespace cc {
|
| namespace {
|
|
|
| +static constexpr int kArbitraryClientId = 0;
|
| +
|
| class SurfaceDisplayOutputSurfaceTest : public testing::Test {
|
| public:
|
| SurfaceDisplayOutputSurfaceTest()
|
| : now_src_(new base::SimpleTestTickClock()),
|
| task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
|
| - allocator_(0),
|
| + allocator_(kArbitraryClientId),
|
| display_size_(1920, 1080),
|
| display_rect_(display_size_),
|
| context_provider_(TestContextProvider::Create()) {
|
| - surface_manager_.RegisterSurfaceIdNamespace(allocator_.id_namespace());
|
| + surface_manager_.RegisterSurfaceClientId(allocator_.client_id());
|
|
|
| std::unique_ptr<FakeOutputSurface> display_output_surface =
|
| FakeOutputSurface::Create3d();
|
| @@ -50,7 +52,7 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
|
|
|
| display_.reset(new Display(
|
| &surface_manager_, &bitmap_manager_, &gpu_memory_buffer_manager_,
|
| - RendererSettings(), allocator_.id_namespace(),
|
| + RendererSettings(), allocator_.client_id(),
|
| std::move(begin_frame_source), std::move(display_output_surface),
|
| std::move(scheduler),
|
| base::MakeUnique<TextureMailboxDeleter>(task_runner_.get())));
|
|
|