| Index: cc/test/render_pass_test_utils.cc
|
| diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
|
| index 94d0824d602f1a514fcd4c0cb77a1c87dc31d3b8..01b03d60bb35544e8154b62a32630705e309993e 100644
|
| --- a/cc/test/render_pass_test_utils.cc
|
| +++ b/cc/test/render_pass_test_utils.cc
|
| @@ -27,7 +27,7 @@ RenderPass* AddRenderPass(RenderPassList* pass_list,
|
| RenderPassId id,
|
| const gfx::Rect& output_rect,
|
| const gfx::Transform& root_transform) {
|
| - scoped_ptr<RenderPass> pass(RenderPass::Create());
|
| + std::unique_ptr<RenderPass> pass(RenderPass::Create());
|
| pass->SetNew(id, output_rect, output_rect, root_transform);
|
| RenderPass* saved = pass.get();
|
| pass_list->push_back(std::move(pass));
|
| @@ -196,7 +196,7 @@ void AddOneOfEveryQuadType(RenderPass* to_pass,
|
| unsigned target = GL_TEXTURE_2D;
|
| gpu::Mailbox gpu_mailbox;
|
| memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1);
|
| - scoped_ptr<SingleReleaseCallbackImpl> callback =
|
| + std::unique_ptr<SingleReleaseCallbackImpl> callback =
|
| SingleReleaseCallbackImpl::Create(base::Bind(&EmptyReleaseCallback));
|
| TextureMailbox mailbox(gpu_mailbox, kSyncTokenForMailboxTextureQuad, target);
|
| ResourceId resource8 = resource_provider->CreateResourceFromTextureMailbox(
|
|
|