Index: content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
index 7eba55f74572aa0c76c24fd6def0a7591ed423b3..c8e49cb568e3dd32a748b28f320c801972eeaeaa 100644 |
--- a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
+++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc |
@@ -148,7 +148,7 @@ struct BrowserGpuMemoryBufferManager::CreateGpuMemoryBufferRequest { |
gfx::BufferUsage usage; |
int client_id; |
int surface_id; |
- scoped_ptr<gfx::GpuMemoryBuffer> result; |
+ std::unique_ptr<gfx::GpuMemoryBuffer> result; |
}; |
struct BrowserGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandleRequest |
@@ -236,7 +236,7 @@ uint32_t BrowserGpuMemoryBufferManager::GetImageTextureTarget( |
return GL_TEXTURE_2D; |
} |
-scoped_ptr<gfx::GpuMemoryBuffer> |
+std::unique_ptr<gfx::GpuMemoryBuffer> |
BrowserGpuMemoryBufferManager::AllocateGpuMemoryBuffer(const gfx::Size& size, |
gfx::BufferFormat format, |
gfx::BufferUsage usage, |
@@ -244,7 +244,7 @@ BrowserGpuMemoryBufferManager::AllocateGpuMemoryBuffer(const gfx::Size& size, |
return AllocateGpuMemoryBufferForSurface(size, format, usage, surface_id); |
} |
-scoped_ptr<gfx::GpuMemoryBuffer> |
+std::unique_ptr<gfx::GpuMemoryBuffer> |
BrowserGpuMemoryBufferManager::CreateGpuMemoryBufferFromHandle( |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |
@@ -408,7 +408,7 @@ bool BrowserGpuMemoryBufferManager::IsNativeGpuMemoryBufferConfiguration( |
native_configurations_.end(); |
} |
-scoped_ptr<gfx::GpuMemoryBuffer> |
+std::unique_ptr<gfx::GpuMemoryBuffer> |
BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferForSurface( |
const gfx::Size& size, |
gfx::BufferFormat format, |