| Index: content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.h b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| index 946ccf0e505b0da88a0812d927964af9deddaa9d..e41b3e500f3ed6a0a7dca938b615aa87d148966a 100644
|
| --- a/content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| +++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.h
|
| @@ -62,12 +62,12 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
|
| gfx::BufferUsage usage);
|
|
|
| // Overridden from gpu::GpuMemoryBufferManager:
|
| - scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
|
| + std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
|
| const gfx::Size& size,
|
| gfx::BufferFormat format,
|
| gfx::BufferUsage usage,
|
| int32_t surface_id) override;
|
| - scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromHandle(
|
| + std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBufferFromHandle(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| gfx::BufferFormat format) override;
|
| @@ -134,7 +134,7 @@ class CONTENT_EXPORT BrowserGpuMemoryBufferManager
|
| int client_id,
|
| const CreateCallback& callback)>;
|
|
|
| - scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface(
|
| + std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface(
|
| const gfx::Size& size,
|
| gfx::BufferFormat format,
|
| gfx::BufferUsage usage,
|
|
|