| Index: gpu/ipc/client/gpu_memory_buffer_impl_surface_texture.cc
|
| diff --git a/gpu/ipc/client/gpu_memory_buffer_impl_surface_texture.cc b/gpu/ipc/client/gpu_memory_buffer_impl_surface_texture.cc
|
| index 5ff527e2dafa79ddc8674b83bf23f944413c18f4..c91f28a9b613287facefb120ee6d035a24bf9016 100644
|
| --- a/gpu/ipc/client/gpu_memory_buffer_impl_surface_texture.cc
|
| +++ b/gpu/ipc/client/gpu_memory_buffer_impl_surface_texture.cc
|
| @@ -5,6 +5,7 @@
|
| #include "gpu/ipc/client/gpu_memory_buffer_impl_surface_texture.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "gpu/ipc/common/android/surface_texture_manager.h"
|
| #include "gpu/ipc/common/gpu_memory_buffer_support.h"
|
| @@ -62,7 +63,7 @@ GpuMemoryBufferImplSurfaceTexture::~GpuMemoryBufferImplSurfaceTexture() {
|
| }
|
|
|
| // static
|
| -scoped_ptr<GpuMemoryBufferImplSurfaceTexture>
|
| +std::unique_ptr<GpuMemoryBufferImplSurfaceTexture>
|
| GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| @@ -78,7 +79,7 @@ GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
|
| ANativeWindow_setBuffersGeometry(native_window, size.width(), size.height(),
|
| WindowFormat(format));
|
|
|
| - return make_scoped_ptr(new GpuMemoryBufferImplSurfaceTexture(
|
| + return base::WrapUnique(new GpuMemoryBufferImplSurfaceTexture(
|
| handle.id, size, format, callback, native_window));
|
| }
|
|
|
|
|