| Index: gpu/command_buffer/tests/gl_manager.cc
|
| diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
|
| index ce9fd3ccd7f2c5f83b3c34f2109e1b95b960ee33..43c59676c901a2d084e7b834d9ccc3b6ea0545e1 100644
|
| --- a/gpu/command_buffer/tests/gl_manager.cc
|
| +++ b/gpu/command_buffer/tests/gl_manager.cc
|
| @@ -14,6 +14,7 @@
|
|
|
| #include "base/at_exit.h"
|
| #include "base/bind.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/ref_counted_memory.h"
|
| #include "build/build_config.h"
|
| #include "gpu/command_buffer/client/gles2_cmd_helper.h"
|
| @@ -214,18 +215,18 @@ GLManager::~GLManager() {
|
| }
|
| }
|
|
|
| -scoped_ptr<gfx::GpuMemoryBuffer> GLManager::CreateGpuMemoryBuffer(
|
| +std::unique_ptr<gfx::GpuMemoryBuffer> GLManager::CreateGpuMemoryBuffer(
|
| const gfx::Size& size,
|
| gfx::BufferFormat format) {
|
| #if defined(OS_MACOSX)
|
| if (use_iosurface_memory_buffers_) {
|
| - return make_scoped_ptr<gfx::GpuMemoryBuffer>(
|
| + return base::WrapUnique<gfx::GpuMemoryBuffer>(
|
| new IOSurfaceGpuMemoryBuffer(size, format));
|
| }
|
| #endif // defined(OS_MACOSX)
|
| std::vector<uint8_t> data(gfx::BufferSizeForBufferFormat(size, format), 0);
|
| scoped_refptr<base::RefCountedBytes> bytes(new base::RefCountedBytes(data));
|
| - return make_scoped_ptr<gfx::GpuMemoryBuffer>(
|
| + return base::WrapUnique<gfx::GpuMemoryBuffer>(
|
| new GpuMemoryBufferImpl(bytes.get(), size, format));
|
| }
|
|
|
| @@ -566,7 +567,7 @@ int32_t GLManager::CreateGpuMemoryBufferImage(size_t width,
|
| unsigned internalformat,
|
| unsigned usage) {
|
| DCHECK_EQ(usage, static_cast<unsigned>(GL_READ_WRITE_CHROMIUM));
|
| - scoped_ptr<gfx::GpuMemoryBuffer> buffer = CreateGpuMemoryBuffer(
|
| + std::unique_ptr<gfx::GpuMemoryBuffer> buffer = CreateGpuMemoryBuffer(
|
| gfx::Size(width, height), gfx::BufferFormat::RGBA_8888);
|
| return CreateImage(buffer->AsClientBuffer(), width, height, internalformat);
|
| }
|
|
|