| Index: cc/raster/texture_compressor.cc
|
| diff --git a/cc/raster/texture_compressor.cc b/cc/raster/texture_compressor.cc
|
| index b8992bb9eefc87013dcefba93aa1f49b24bac5de..6aabf6792dfd2c86b05c98bae87f2590d856a04f 100644
|
| --- a/cc/raster/texture_compressor.cc
|
| +++ b/cc/raster/texture_compressor.cc
|
| @@ -5,6 +5,7 @@
|
| #include "cc/raster/texture_compressor.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "cc/raster/texture_compressor_etc1.h"
|
|
|
| #if defined(ARCH_CPU_X86_FAMILY)
|
| @@ -14,16 +15,16 @@
|
|
|
| namespace cc {
|
|
|
| -scoped_ptr<TextureCompressor> TextureCompressor::Create(Format format) {
|
| +std::unique_ptr<TextureCompressor> TextureCompressor::Create(Format format) {
|
| switch (format) {
|
| case kFormatETC1: {
|
| #if defined(ARCH_CPU_X86_FAMILY)
|
| base::CPU cpu;
|
| if (cpu.has_sse2()) {
|
| - return make_scoped_ptr(new TextureCompressorETC1SSE());
|
| + return base::WrapUnique(new TextureCompressorETC1SSE());
|
| }
|
| #endif
|
| - return make_scoped_ptr(new TextureCompressorETC1());
|
| + return base::WrapUnique(new TextureCompressorETC1());
|
| }
|
| }
|
|
|
|
|