Index: gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h |
diff --git a/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h b/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h |
index 3ec59e90b89c10c845dfa4640a7887a0972f2589..44b53df5a7b0bdee967b6048e0d16fed1ab47517 100644 |
--- a/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h |
+++ b/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h |
@@ -7,6 +7,8 @@ |
#include <stddef.h> |
+#include <memory> |
+ |
#include "base/macros.h" |
#include "gpu/gpu_export.h" |
#include "gpu/ipc/client/gpu_memory_buffer_impl.h" |
@@ -23,7 +25,7 @@ class GPU_EXPORT GpuMemoryBufferImplOzoneNativePixmap |
public: |
~GpuMemoryBufferImplOzoneNativePixmap() override; |
- static scoped_ptr<GpuMemoryBufferImplOzoneNativePixmap> CreateFromHandle( |
+ static std::unique_ptr<GpuMemoryBufferImplOzoneNativePixmap> CreateFromHandle( |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |
gfx::BufferFormat format, |
@@ -51,9 +53,9 @@ class GPU_EXPORT GpuMemoryBufferImplOzoneNativePixmap |
const gfx::Size& size, |
gfx::BufferFormat format, |
const DestructionCallback& callback, |
- scoped_ptr<ui::ClientNativePixmap> native_pixmap); |
+ std::unique_ptr<ui::ClientNativePixmap> native_pixmap); |
- scoped_ptr<ui::ClientNativePixmap> pixmap_; |
+ std::unique_ptr<ui::ClientNativePixmap> pixmap_; |
void* data_; |
DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImplOzoneNativePixmap); |