| Index: gpu/ipc/service/gpu_memory_buffer_factory.cc
|
| diff --git a/gpu/ipc/service/gpu_memory_buffer_factory.cc b/gpu/ipc/service/gpu_memory_buffer_factory.cc
|
| index 01c62be8c966405198382a68e28853f04e7b8b86..bd8a79fee1b2247c0a513b7c7f0290cced798cf9 100644
|
| --- a/gpu/ipc/service/gpu_memory_buffer_factory.cc
|
| +++ b/gpu/ipc/service/gpu_memory_buffer_factory.cc
|
| @@ -5,6 +5,7 @@
|
| #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "build/build_config.h"
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -22,15 +23,16 @@
|
| namespace gpu {
|
|
|
| // static
|
| -scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::CreateNativeType() {
|
| +std::unique_ptr<GpuMemoryBufferFactory>
|
| +GpuMemoryBufferFactory::CreateNativeType() {
|
| #if defined(OS_MACOSX)
|
| - return make_scoped_ptr(new GpuMemoryBufferFactoryIOSurface);
|
| + return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface);
|
| #endif
|
| #if defined(OS_ANDROID)
|
| - return make_scoped_ptr(new GpuMemoryBufferFactorySurfaceTexture);
|
| + return base::WrapUnique(new GpuMemoryBufferFactorySurfaceTexture);
|
| #endif
|
| #if defined(USE_OZONE)
|
| - return make_scoped_ptr(new GpuMemoryBufferFactoryOzoneNativePixmap);
|
| + return base::WrapUnique(new GpuMemoryBufferFactoryOzoneNativePixmap);
|
| #endif
|
| NOTREACHED();
|
| return nullptr;
|
|
|